align gui/sandbox with mouse button changes

DFHack · Oct 1, 2023 · 8259d95 · 8259d95
1 parent 43a22b3
commit 8259d95
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/gui/sandbox.lua b/gui/sandbox.lua
@@ -121,8 +121,8 @@ function Sandbox:init()
                     key='CUSTOM_SHIFT_U',
                     label="Spawn unit",
                     on_activate=function()
-                        df.global.enabler.mouse_lbut_down = 0
                         clear_arena_action()
+                        gui.markMouseClicksHandled{_MOUSE_L=true}
                         view:sendInputToParent{ARENA_CREATE_CREATURE=true}
                         df.global.game.main_interface.arena_unit.editing_filter = true
                     end,
@@ -162,8 +162,8 @@ function Sandbox:init()
                     key='CUSTOM_SHIFT_T',
                     label="Spawn tree",
                     on_activate=function()
-                        df.global.enabler.mouse_lbut_down = 0
                         clear_arena_action()
+                        gui.markMouseClicksHandled{_MOUSE_L=true}
                         view:sendInputToParent{ARENA_CREATE_TREE=true}
                         df.global.game.main_interface.arena_tree.editing_filter = true
                     end,
@@ -204,7 +204,7 @@ function Sandbox:onInput(keys)
     if Sandbox.super.onInput(self, keys) then
         return true
     end
-    if keys._MOUSE_L_DOWN then
+    if keys._MOUSE_L then
         if self:getMouseFramePos() then return true end
         for _,mask_panel in ipairs(self.interface_masks) do
             if mask_panel:getMousePos() then return true end
@@ -251,10 +251,6 @@ InterfaceMask.ATTRS{
     frame_background=gui.TRANSPARENT_PEN,
 }
 
-function InterfaceMask:onInput(keys)
-    return keys._MOUSE_L_DOWN and self:getMousePos()
-end
-
 ---------------------
 -- SandboxScreen
 --