mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-05 15:55:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix table-valued settings

Browse Source
This commit is contained in:
uramer 2024-05-18 12:30:21 +02:00
parent e248ba293a
commit ad1c2a0e9f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/data/scripts/omw/settings/menu.lua
View File

@ -157,7 +157,7 @@ local function renderGroup(group, global)
sortedSettings[setting.order] = setting sortedSettings[setting.order] = setting
end end
for _, setting in ipairs(sortedSettings) do for _, setting in ipairs(sortedSettings) do
table.insert(settingLayouts, renderSetting(group, setting, valueSection:get(setting.key), global)) table.insert(settingLayouts, renderSetting(group, setting, valueSection:getCopy(setting.key), global))
end end
local settingsContent = ui.content(interlaceSeparator(settingLayouts, spacedLines(1))) local settingsContent = ui.content(interlaceSeparator(settingLayouts, spacedLines(1)))
@ -288,7 +288,7 @@ local function renderPage(page, options)
table.sort(sortedGroups, pageGroupComparator) table.sort(sortedGroups, pageGroupComparator)
local groupLayouts = {} local groupLayouts = {}
for _, pageGroup in ipairs(sortedGroups) do for _, pageGroup in ipairs(sortedGroups) do
local group = common.getSection(pageGroup.global, common.groupSectionKey):get(pageGroup.key) local group = common.getSection(pageGroup.global, common.groupSectionKey):getCopy(pageGroup.key)
if not group then if not group then
error(string.format('%s group "%s" was not found', pageGroup.global and 'Global' or 'Player', pageGroup.key)) error(string.format('%s group "%s" was not found', pageGroup.global and 'Global' or 'Player', pageGroup.key))
end end
@ -360,7 +360,7 @@ end
local function onSettingChanged(global) local function onSettingChanged(global)
return async:callback(function(groupKey, settingKey) return async:callback(function(groupKey, settingKey)
local group = common.getSection(global, common.groupSectionKey):get(groupKey) local group = common.getSection(global, common.groupSectionKey):getCopy(groupKey)
if not group or not pageOptions[group.page] then return end if not group or not pageOptions[group.page] then return end
local groupElement = groupElements[group.page][group.key] local groupElement = groupElements[group.page][group.key]
@ -375,7 +375,7 @@ local function onSettingChanged(global)
return return
end end
local value = common.getSection(global, group.key):get(settingKey) local value = common.getSection(global, group.key):getCopy(settingKey)
local settingsContent = groupElement.layout.content.settings.content local settingsContent = groupElement.layout.content.settings.content
auxUi.deepDestroy(settingsContent[settingKey]) -- support setting renderers which return UI elements auxUi.deepDestroy(settingsContent[settingKey]) -- support setting renderers which return UI elements
settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global) settingsContent[settingKey] = renderSetting(group, group.settings[settingKey], value, global)
@ -404,7 +404,7 @@ local function onGroupRegistered(global, key)
local group = common.getSection(global, common.groupSectionKey):get(group.key) local group = common.getSection(global, common.groupSectionKey):get(group.key)
if not group or not pageOptions[group.page] then return end if not group or not pageOptions[group.page] then return end
local value = common.getSection(global, group.key):get(settingKey) local value = common.getSection(global, group.key):getCopy(settingKey)
local element = groupElements[group.page][group.key] local element = groupElements[group.page][group.key]
local settingsContent = element.layout.content.settings.content local settingsContent = element.layout.content.settings.content