Use push/pop mechanism for cursors

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

View File

@@ -296,7 +296,7 @@ function onMouseGrabberRelease(self, mousePosition, mouseButton)
end
selectedThing = nil
g_mouse.restoreCursor()
g_mouse.popCursor('target')
self:ungrabMouse()
return true
end
@@ -331,14 +331,14 @@ function startUseWith(thing)
selectedType = 'use'
selectedThing = thing
mouseGrabberWidget:grabMouse()
g_mouse.setCursor('target')
g_mouse.pushCursor('target')
end
function startTradeWith(thing)
selectedType = 'trade'
selectedThing = thing
mouseGrabberWidget:grabMouse()
g_mouse.setCursor('target')
g_mouse.pushCursor('target')
end
function createThingMenu(menuPosition, lookThing, useThing, creatureThing)

View File

@@ -17,7 +17,7 @@ function UIGameMap:onDragEnter(mousePos)
self.currentDragThing = thing
g_mouse.setCursor('target')
g_mouse.pushCursor('target')
self.allowNextRelease = false
return true
end
@@ -25,7 +25,7 @@ end
function UIGameMap:onDragLeave(droppedWidget, mousePos)
self.currentDragThing = nil
self.hoveredWho = nil
g_mouse.restoreCursor()
g_mouse.popCursor('target')
return true
end

View File

@@ -6,14 +6,14 @@ function UIItem:onDragEnter(mousePos)
self:setBorderWidth(1)
self.currentDragThing = item
g_mouse.setCursor('target')
g_mouse.pushCursor('target')
return true
end
function UIItem:onDragLeave(droppedWidget, mousePos)
if self:isVirtual() then return false end
self.currentDragThing = nil
g_mouse.restoreCursor()
g_mouse.popCursor('target')
self:setBorderWidth(0)
self.hoveredWho = nil
return true