Skip to content

Commit

Permalink
Merge pull request #1313 from wiktor-obrebski/fix/widgets-constants
Browse files Browse the repository at this point in the history
Migrate scripts widgets constant to use getter/setter style
  • Loading branch information
myk002 authored Oct 8, 2024
2 parents baf6610 + d5ab9f9 commit 036ddb3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion gui/autodump.lua
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function Autodump:onInput(keys)
end
local now_ms = dfhack.getTickCount()
if same_xyz(pos, self.last_map_click_pos) and
now_ms - self.last_map_click_ms <= widgets.DOUBLE_CLICK_MS then
now_ms - self.last_map_click_ms <= widgets.getDoubleClickMs() then
self:reset_double_click()
self:do_dump(pos)
self.mark = nil
Expand Down
2 changes: 1 addition & 1 deletion gui/teleport.lua
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ function Teleport:onInput(keys)
end
local now_ms = dfhack.getTickCount()
if same_xyz(pos, self.last_map_click_pos) and
now_ms - self.last_map_click_ms <= widgets.DOUBLE_CLICK_MS then
now_ms - self.last_map_click_ms <= widgets.getDoubleClickMs() then
self:reset_double_click()
self:do_teleport(pos)
self.mark = nil
Expand Down
12 changes: 6 additions & 6 deletions internal/control-panel/registry.lua
Original file line number Diff line number Diff line change
Expand Up @@ -202,26 +202,26 @@ PREFERENCES_BY_IDX = {
desc='How long to wait for the second click of a double click, in ms.',
default=500,
min=50,
get_fn=function() return widgets.DOUBLE_CLICK_MS end,
set_fn=function(val) widgets.DOUBLE_CLICK_MS = val end,
get_fn=widgets.getDoubleClickMs,
set_fn=widgets.setDoubleClickMs,
},
{
name='SCROLL_DELAY_MS',
label='Mouse scroll repeat delay (ms)',
desc='The delay between events when holding the mouse button down on a scrollbar, in ms.',
default=20,
min=5,
get_fn=function() return widgets.SCROLL_DELAY_MS end,
set_fn=function(val) widgets.SCROLL_DELAY_MS = val end,
get_fn=widgets.getScrollDelayMs,
set_fn=widgets.setScrollDelayMs,
},
{
name='SCROLL_INITIAL_DELAY_MS',
label='Mouse initial scroll repeat delay (ms)',
desc='The delay before scrolling quickly when holding the mouse button down on a scrollbar, in ms.',
default=300,
min=5,
get_fn=function() return widgets.SCROLL_INITIAL_DELAY_MS end,
set_fn=function(val) widgets.SCROLL_INITIAL_DELAY_MS = val end,
get_fn=widgets.getScrollInitialDelayMs,
set_fn=widgets.setScrollInitialDelayMs,
},
}

Expand Down
2 changes: 1 addition & 1 deletion internal/journal/text_editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ function TextEditorView:getMultiLeftClick(x, y)
if (
self.last_click.x ~= x or
self.last_click.y ~= y or
from_last_click_ms > widgets.DOUBLE_CLICK_MS
from_last_click_ms > widgets.getDoubleClickMs()
) then
self.clicks_count = 0;
end
Expand Down

0 comments on commit 036ddb3

Please sign in to comment.