Merge branch 'develop' into cyclehotkey2

2023-05-02 08:22:10 +02:00 · 2023-05-02 08:22:10 +02:00 · f181b50a30
parent cfcb1cd937 3f51f24f91
commit f181b50a30
1 changed files with 3 additions and 1 deletions
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@ -836,7 +836,9 @@ function Scrollbar:update(top_elem, elems_per_page, num_elems)
 end

 local function scrollbar_do_drag(scrollbar)
-    local _,y = scrollbar.frame_body:localXY(dfhack.screen.getMousePos())
+    local x,y = dfhack.screen.getMousePos()
+    if not y then return end
+    x,y = scrollbar.frame_body:localXY(x, y)
    local cur_pos = y - scrollbar.is_dragging
    local max_top = scrollbar.num_elems - scrollbar.elems_per_page + 1
    local max_pos = scrollbar_get_max_pos_and_height(scrollbar)