From db90cfb25906bc5ad23012387ba9480a454f8273 Mon Sep 17 00:00:00 2001 From: RoosterDragon Date: Sat, 1 Mar 2025 09:30:50 +0000 Subject: [PATCH] Show current pan behaviour & zoom modifier in input settings. Fixes regression from 0338258b45ca885e6007ae38ed5b770091449bfc. --- .../Widgets/Logic/Settings/InputSettingsLogic.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/InputSettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/InputSettingsLogic.cs index 83ad8c9abe..96f9eb7863 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Settings/InputSettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Settings/InputSettingsLogic.cs @@ -68,7 +68,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic var mouseScrollDropdown = panel.Get("MOUSE_SCROLL_TYPE_DROPDOWN"); mouseScrollDropdown.OnMouseDown = _ => ShowMouseScrollDropdown(mouseScrollDropdown, gs); - mouseScrollDropdown.GetText = gs.MouseScroll.ToString; + + // MouseScroll can change, must display latest value. +#pragma warning disable IDE0200 // Remove unnecessary lambda expression + mouseScrollDropdown.GetText = () => gs.MouseScroll.ToString(); +#pragma warning restore IDE0200 var mouseControlDescClassic = panel.Get("MOUSE_CONTROL_DESC_CLASSIC"); mouseControlDescClassic.IsVisible = () => gs.UseClassicMouseStyle; @@ -113,7 +117,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic var zoomModifierDropdown = panel.Get("ZOOM_MODIFIER"); zoomModifierDropdown.OnMouseDown = _ => ShowZoomModifierDropdown(zoomModifierDropdown, gs); - zoomModifierDropdown.GetText = gs.ZoomModifier.ToString; + + // ZoomModifier can change, must display latest value. +#pragma warning disable IDE0200 // Remove unnecessary lambda expression + zoomModifierDropdown.GetText = () => gs.ZoomModifier.ToString(); +#pragma warning restore IDE0200 SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel);