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

[Keybinds] Move "build_keybind_string" function

Browse source
This commit is contained in:
Azumgi 2018-10-15 14:27:44 +03:00
parent 1c8e1121fe
commit f5b65201e0
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vmf/scripts/mods/vmf/modules/core/keybindings.lua
View file

@ -340,6 +340,18 @@ function vmf.get_readable_key_name(key_name)
return _readable_key_names[key_name]
end
function vmf.build_keybind_string(keys)
local keybind_string = ""
for i, key_name in ipairs(keys) do
if i == 1 then
keybind_string = keybind_string .. _readable_key_names[key_name]
else
keybind_string = keybind_string .. " + " .. _readable_key_names[key_name]
end
end
return keybind_string
end
-- ####################################################################################################################
-- ##### Script #######################################################################################################
-- ####################################################################################################################

20
vmf/scripts/mods/vmf/modules/ui/options/vmf_options_view.lua
View file

@ -2482,22 +2482,6 @@ end
-- ╚═╝ ╚═╝╚══════╝ ╚═╝ ╚═════╝ ╚═╝╚═╝ ╚═══╝╚═════╝
local function build_keybind_string(keys)
local keybind_string = ""
for i, key in ipairs(keys) do
if i == 1 then
keybind_string = keybind_string .. vmf.get_readable_key_name(key)
else
keybind_string = keybind_string .. " + " .. vmf.get_readable_key_name(key)
end
end
return keybind_string
end
local function create_keybind_widget(widget_definition, scenegraph_id)
local widget_size = SETTINGS_LIST_REGULAR_WIDGET_SIZE
@ -3334,7 +3318,7 @@ VMFOptionsView.callback_setting_keybind = function (self, widget_content)
table.insert(pressed_buttons, "shift")
end
local preview_string = build_keybind_string(pressed_buttons)
local preview_string = vmf.build_keybind_string(pressed_buttons)
widget_content.keybind_text = preview_string ~= "" and preview_string or "_"
widget_content.keys = pressed_buttons
@ -3834,7 +3818,7 @@ VMFOptionsView.update_picked_option_for_settings_list_widgets = function (self)
widget_content.keys = widget_content.default_value
end
widget_content.keybind_text = build_keybind_string(widget_content.keys)
widget_content.keybind_text = vmf.build_keybind_string(widget_content.keys)
elseif widget_type == "numeric" then