oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-01 17:38:41 +00:00
Code Wiki Activity

add conflict warnings

Browse source
This commit is contained in:
y5nw 2025-05-25 00:57:36 +02:00
parent 5a8bae5fff
commit 8eba9ffa2c
2 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
builtin/common/settings/components.lua
View file

@ -430,17 +430,6 @@ local function make_noise_params(setting)
} }
end end
local function has_keybinding_conflict(t1, t2)
for _, v1 in pairs(t1) do
for _, v2 in pairs(t2) do
if core.are_keycodes_equal(v1, v2) then
return true
end
end
end
return false
end
function make.key(setting) function make.key(setting)
local btn_bind = "bind_" .. setting.name local btn_bind = "bind_" .. setting.name
local btn_edit = "edit_" .. setting.name local btn_edit = "edit_" .. setting.name

40
builtin/common/settings/dlg_change_keybinding.lua
View file

@ -22,11 +22,24 @@ local function get_formspec(dialogdata)
("button[0.5,7.7;2.4,0.8;btn_save;%s]"):format(fgettext("Save")), ("button[0.5,7.7;2.4,0.8;btn_save;%s]"):format(fgettext("Save")),
} }
local warning = ""
local cells = {} local cells = {}
for _, key in ipairs(value) do for idx, key in ipairs(value) do
table.insert(cells, core.formspec_escape(core.get_keycode_name(key))) local prefix = ""
for _, o in ipairs(core.full_settingtypes) do
if o.type == "key" and o.name ~= name
and has_keybinding_conflict(core.settings:get(o.name):split("|"), key) then
prefix = mt_color_orange
if idx == selection then
warning = core.colorize(mt_color_orange, fgettext([[Conflicts with "$1"]], fgettext(o.readable_name)))
end end
table.insert(fs, ("textlist[0.5,1.3;5,4;keylist;%s;%d;false]"):format(table.concat(cells, ","), selection)) break
end
end
table.insert(cells, core.formspec_escape(prefix .. core.get_keycode_name(key)))
end
table.insert(fs, ("textlist[0.5,1.3;5,3.8;keylist;%s;%d;false]"):format(table.concat(cells, ","), selection))
table.insert(fs, ("label[0.5,5.4;%s]"):format(warning))
return table.concat(fs) return table.concat(fs)
end end
@ -121,3 +134,24 @@ function show_change_keybinding_dlg(setting, tabview)
return is_mainmenu return is_mainmenu
end end
function has_keybinding_conflict(t1, t2) -- not local as it is also used by the make.key component
if type(t2) == "string" then
if type(t1) == "string" then
return core.are_keycodes_equal(t1, t2)
else
for _, v1 in pairs(t1) do
if core.are_keycodes_equal(v1, t2) then
return true
end
end
end
else
for _, v2 in pairs(t2) do
if has_keybinding_conflict(t1, v2) then
return true
end
end
end
return false
end