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

Use push/pop mechanism for cursors

Browse Source
This commit is contained in:
Eduardo Bart
2013-01-25 11:47:51 -02:00
parent 3a47c4f2e1
commit a144174c41
10 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/corelib/ui/uiresizeborder.lua
View File

@@ -19,7 +19,7 @@ end
function UIResizeBorder:onDestroy()
if self.hovering then
g_mouse.restoreCursor()
g_mouse.popCursor(self.cursortype)
end
end
@@ -27,19 +27,20 @@ function UIResizeBorder:onHoverChange(hovered)
if hovered then
if g_mouse.isCursorChanged() or g_mouse.isPressed() then return end
if self:getWidth() > self:getHeight() then
g_mouse.setCursor('vertical')
self.vertical = true
self.cursortype = 'vertical'
else
g_mouse.setCursor('horizontal')
self.vertical = false
self.cursortype = 'horizontal'
end
g_mouse.pushCursor(self.cursortype)
self.hovering = true
if not self:isPressed() then
g_effects.fadeIn(self)
end
else
if not self:isPressed() and self.hovering then
g_mouse.restoreCursor()
g_mouse.popCursor(self.cursortype)
g_effects.fadeOut(self)
self.hovering = false
end
@@ -67,7 +68,7 @@ end
function UIResizeBorder:onMouseRelease(mousePos, mouseButton)
if not self:isHovered() then
g_mouse.restoreCursor()
g_mouse.popCursor(self.cursortype)
g_effects.fadeOut(self)
self.hovering = false
end

9
modules/corelib/ui/uisplitter.lua
View File

@@ -14,19 +14,20 @@ function UISplitter:onHoverChange(hovered)
if hovered and (self:canUpdateMargin(margin + 1) ~= margin or self:canUpdateMargin(margin - 1) ~= margin) then
if g_mouse.isCursorChanged() or g_mouse.isPressed() then return end
if self:getWidth() > self:getHeight() then
g_mouse.setCursor('vertical')
self.vertical = true
self.cursortype = 'vertical'
else
g_mouse.setCursor('horizontal')
self.vertical = false
self.cursortype = 'horizontal'
end
self.hovering = true
g_mouse.pushCursor(self.cursortype)
if not self:isPressed() then
g_effects.fadeIn(self)
end
else
if not self:isPressed() and self.hovering then
g_mouse.restoreCursor()
g_mouse.popCursor(self.cursortype)
g_effects.fadeOut(self)
self.hovering = false
end
@@ -67,7 +68,7 @@ end
function UISplitter:onMouseRelease(mousePos, mouseButton)
if not self:isHovered() then
g_mouse.restoreCursor()
g_mouse.popCursor(self.cursortype)
g_effects.fadeOut(self)
self.hovering = false
end