Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-17 04:53:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve tab navigation and scrolling

Browse Source 
* Fix with use with over creatures when you are over force use objects
* Fix textedit wrapping
This commit is contained in:
Eduardo Bart
2013-01-24 15:45:26 -02:00
parent bc55cbbbd1
commit 5b65088426
5 changed files with 74 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/corelib/ui/uiscrollbar.lua
View File

@@ -82,18 +82,30 @@ local function updateSlider(self)
end
end
local function parseSliderPos(self, pos, move)
local point, delta
local function parseSliderPos(self, slider, pos, move)
local delta, hotDistance
if self.orientation == 'vertical' then
point = pos.y
delta = move.y
hotDistance = pos.y - slider:getY()
else
point = pos.x
delta = move.x
hotDistance = pos.x - slider:getX()
end
if (delta > 0 and hotDistance + delta > self.hotDistance) or
(delta < 0 and hotDistance + delta < self.hotDistance) then
local range, pxrange, px, offset, center = calcValues(self)
local newvalue = self.value + delta * (range / (pxrange - px))
self:setValue(newvalue)
end
end
local function parseSliderPress(self, slider, pos, button)
if self.orientation == 'vertical' then
self.hotDistance = pos.y - slider:getY()
else
self.hotDistance = pos.x - slider:getX()
end
local range, pxrange, px, offset, center = calcValues(self)
local newvalue = self.value + delta * (range / (pxrange - px))
self:setValue(newvalue)
end
-- public functions
@@ -114,10 +126,11 @@ end
function UIScrollBar:onSetup()
self.setupDone = true
--signalcall(self.onValueChange, self, self.value)
local sliderButton = self:getChildById('sliderButton')
g_mouse.bindAutoPress(self:getChildById('decrementButton'), function() self:decrement() end, 300)
g_mouse.bindAutoPress(self:getChildById('incrementButton'), function() self:increment() end, 300)
g_mouse.bindPressMove(self:getChildById('sliderButton'), function(mousePos, mouseMoved) parseSliderPos(self, mousePos, mouseMoved) end)
g_mouse.bindPressMove(sliderButton, function(mousePos, mouseMoved) parseSliderPos(self, sliderButton, mousePos, mouseMoved) end)
g_mouse.bindPress(sliderButton, function(mousePos, mouseButton) parseSliderPress(self, sliderButton, mousePos, mouseButton) end)
updateSlider(self)
end