Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions modules/corelib/ui/uidragicon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,32 @@ local uiIcon = nil

function UIDragIcon:display(item)
if modules.client_options.getOption('showDragIcon') then
uiIcon = g_ui.createWidget('UIDragIcon', rootWidget)
if uiIcon == nil then
uiIcon = g_ui.createWidget('UIDragIcon', rootWidget)
uiIcon:setVirtual(true)
uiIcon:setShowCount(false)
end

uiIcon:setItem(item)
uiIcon:setVirtual(true)
uiIcon:setShowCount(false)
uiIcon:show()

connect(rootWidget, { onMouseMove = onMouseMove })
end

connect(rootWidget, { onMouseMove = onMouseMove })
end

function UIDragIcon:hide()
if uiIcon ~= nil then
uiIcon:hide()
disconnect(rootWidget, { onMouseMove = onMouseMove })
end
end

function UIDragIcon:destroy()
if uiIcon ~= nil then
disconnect(rootWidget, { onMouseMove = onMouseMove })
uiIcon:destroy()
uiIcon = nil
end
disconnect(rootWidget, { onMouseMove = onMouseMove })
end

function onMouseMove(self, mousePos, mouseMoved)
Expand Down
2 changes: 1 addition & 1 deletion modules/game_interface/widgets/uigamemap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function UIGameMap:onDragEnter(mousePos)
return false
end

if not thing:isNotMoveable() then
if thing:isItem() and not thing:isNotMoveable() then
UIDragIcon:display(thing)
end

Expand Down
4 changes: 2 additions & 2 deletions modules/game_interface/widgets/uiitem.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function UIItem:onDrop(widget, mousePos)
return false
end

if self.isVirtual() then
if self:isVirtual() then
UIDragIcon:hide()
end

Expand Down Expand Up @@ -83,7 +83,7 @@ function UIItem:onDestroy()
self.hoveredWho:setBorderWidth(0)
end

if self.isVirtual() then
if self:isVirtual() then
UIDragIcon:hide()
end

Expand Down