Reused cached label, added one for dropdown. Fixed issue with setting…

… Speed limits theme in main menu
CitiesSkylinesMods · Jun 2, 2022 · c6042f2 · c6042f2
1 parent b6c17ac
commit c6042f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/TLM/TLM/State/OptionsTabs/GeneralTab_LocalisationGroup.cs b/TLM/TLM/State/OptionsTabs/GeneralTab_LocalisationGroup.cs
@@ -151,7 +151,12 @@ public static class GeneralTab_LocalisationGroup {
         }
 
         private static void OnRoadSignsThemeChanged(int newThemeIndex) {
-            if (!Options.IsGameLoaded()) {
+            if (!Options.IsGameLoaded(false)) {
+                // update global config only, skip reloading theme
+                var selectedTheme = RoadSignThemeManager.Instance.ThemeNames[newThemeIndex];
+                Main config = GlobalConfig.Instance.Main;
+                config.RoadSignTheme = selectedTheme;
+                GlobalConfig.WriteConfig();
                 return;
             }
 

diff --git a/TLM/TLM/UI/Helpers/DropDownOption.cs b/TLM/TLM/UI/Helpers/DropDownOption.cs
@@ -9,6 +9,7 @@ namespace TrafficManager.UI.Helpers {
 
     public class DropDownOption<TEnum> : SerializableUIOptionBase<TEnum, UIDropDown, DropDownOption<TEnum>>
         where TEnum : struct, Enum, IConvertible {
+        private UILabel _dropdownLabel;
 
         public DropDownOption(string fieldName, Options.PersistTo scope = Options.PersistTo.Savegame)
         : base(fieldName, scope) { }
@@ -66,6 +67,7 @@ public DropDownOption(string fieldName, Options.PersistTo scope = Options.Persis
                 eventCallback: InvokeOnValueChanged) as UIDropDown;
 
             _ui.width = 350;
+            _dropdownLabel = _ui.parent.Find<UILabel>("Label");
 
             UpdateTooltip();
             UpdateReadOnly();
@@ -97,7 +99,7 @@ public DropDownOption(string fieldName, Options.PersistTo scope = Options.Persis
             _ui.isInteractive = !readOnly;
             _ui.opacity = readOnly ? 0.3f : 1f;
             // parent is UIPanel containing text label and dropdown
-            _ui.parent.Find<UILabel>("Label").opacity = readOnly ? 0.3f : 1f;
+            _dropdownLabel.opacity = readOnly ? 0.3f : 1f;
         }
     }
 }
diff --git a/TLM/TLM/UI/Helpers/SliderOption.cs b/TLM/TLM/UI/Helpers/SliderOption.cs
@@ -124,7 +124,7 @@ public byte FloatToByte(float val)
             _ui.thumbObject.isInteractive = !readOnly;
             _ui.thumbObject.opacity = readOnly ? 0.3f : 1f;
             // parent is UIPanel containing text label and slider
-            _ui.parent.Find<UILabel>("Label").opacity = readOnly ? 0.3f : 1f;
+            _sliderLabel.opacity = readOnly ? 0.3f : 1f;
         }
     }
 }