bitsquid_dt/Darktide-Mod-Framework
bitsquid_dt/Darktide-Mod-Framework
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

Fix for keybind popup opening after dropdown selection

Browse source
This commit is contained in:
Aussiemon 2023-03-12 18:18:58 -06:00
parent 14242acb54
commit 99799a4a10
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints.lua
View file

@ -23,6 +23,9 @@ local group_header_height = 80
local DEFAULT_NUM_DECIMALS = 0 local DEFAULT_NUM_DECIMALS = 0
local _dropdown_deadzone = 0.25 -- 250ms delay before opening keybind popups
local _last_dropdown_pressed = -1
local value_font_style = table.clone(UIFontSettings.list_button) local value_font_style = table.clone(UIFontSettings.list_button)
value_font_style.offset = { value_font_style.offset = {
settings_grid_width - settings_value_width + 25, settings_grid_width - settings_value_width + 25,
@ -694,10 +697,12 @@ blueprints.dropdown = {
local value_changed = new_value ~= nil local value_changed = new_value ~= nil
if value_changed and new_value ~= value then if value_changed then
local on_activated = entry.on_activated _last_dropdown_pressed = t
if new_value ~= value then
on_activated(new_value, entry) local on_activated = entry.on_activated
on_activated(new_value, entry)
end
end end
local scrollbar_hotspot = content.scrollbar_hotspot local scrollbar_hotspot = content.scrollbar_hotspot
@ -730,7 +735,11 @@ blueprints.keybind = {
local hotspot = content.hotspot local hotspot = content.hotspot
if hotspot.on_released then if hotspot.on_released then
parent:show_keybind_popup(widget, entry, content.entry.cancel_keys) if (t - _last_dropdown_pressed) > _dropdown_deadzone then
parent:show_keybind_popup(widget, entry, content.entry.cancel_keys)
else
_last_dropdown_pressed = -1
end
end end
end end
} }