oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

partial: indicate multiple keybindings in setting menu

Browse source
This commit is contained in:
y5nw 2025-04-28 23:51:18 +02:00 • committed by y5nw
parent bca82114ae
commit fc6238ae4e
1 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -430,11 +430,23 @@ 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_clear = "unbind_" .. setting.name local btn_clear = "unbind_" .. setting.name
local function add_conflict_warnings(fs, height) local function add_conflict_warnings(fs, height)
local value = core.settings:get(setting.name) local value = core.settings:get(setting.name):split("|")
if value == "" then if value == "" then
return height return height
end end
@ -447,7 +459,7 @@ function make.key(setting)
for _, o in ipairs(core.full_settingtypes) do for _, o in ipairs(core.full_settingtypes) do
if o.type == "key" and o.name ~= setting.name and if o.type == "key" and o.name ~= setting.name and
core.are_keycodes_equal(core.settings:get(o.name), value) then has_keybinding_conflict(core.settings:get(o.name):split("|"), value) then
local is_current_close_world = setting.name == "keymap_close_world" local is_current_close_world = setting.name == "keymap_close_world"
local is_other_close_world = o.name == "keymap_close_world" local is_other_close_world = o.name == "keymap_close_world"
@ -472,17 +484,22 @@ function make.key(setting)
get_formspec = function(self, avail_w) get_formspec = function(self, avail_w)
self.resettable = core.settings:has(setting.name) self.resettable = core.settings:has(setting.name)
local btn_bind_width = math.max(2.5, avail_w / 2) local btn_bind_width = math.max(2.5, avail_w / 2)
local value = core.settings:get(setting.name) local value = core.settings:get(setting.name):split("|")
local fs = { local fs = {
("label[0,0.4;%s]"):format(get_label(setting)), ("label[0,0.4;%s]"):format(get_label(setting)),
("button_key[%f,0;%f,0.8;%s;%s]"):format(
btn_bind_width, btn_bind_width - 0.8,
btn_bind, core.formspec_escape(value)),
("image_button[%f,0;0.8,0.8;%s;%s;]"):format(avail_w - 0.8, ("image_button[%f,0;0.8,0.8;%s;%s;]"):format(avail_w - 0.8,
core.formspec_escape(defaulttexturedir .. "clear.png"), core.formspec_escape(defaulttexturedir .. "clear.png"), btn_clear),
btn_clear),
("tooltip[%s;%s]"):format(btn_clear, fgettext("Remove keybinding")), ("tooltip[%s;%s]"):format(btn_clear, fgettext("Remove keybinding")),
} }
if #value < 2 then
table.insert(fs, ("button_key[%f,0;%f,0.8;%s;%s]"):format(
btn_bind_width, btn_bind_width-0.8,
btn_bind, core.formspec_escape(value[1] or "")))
else
table.insert(fs, ("button[%f,0;%f,0.8;%s;%s]"):format(
btn_bind_width, btn_bind_width-0.8,
btn_edit, fgettext("Edit")))
end
local height = 0.8 local height = 0.8
height = add_conflict_warnings(fs, height) height = add_conflict_warnings(fs, height)
return table.concat(fs), height return table.concat(fs), height