Settings page controls update rate display toggle

Don't implement toggle in selected DispalyModules, implement globally in Settings. Access static value via GuiUtils. Per-window refresh rate currently implemented for Ascent Guidance and Custom Info Window as copy-pasta.
rnlahaye · Feb 28, 2022 · ae24ad7 · ae24ad7
1 parent 594fd9a
commit ae24ad7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/MechJeb2/GuiUtils.cs b/MechJeb2/GuiUtils.cs
@@ -414,6 +414,7 @@ public enum SkinType { Default, MechJeb1, Compact }
         public static int scaledScreenWidth = 1;
         public static int scaledScreenHeight = 1;
         public static bool dontUseDropDownMenu = false;
+        public static bool showAdvancedWindowSettings = false;
         public static GUISkin defaultSkin;
         public static GUISkin compactSkin;
         public static GUISkin transparentSkin;

diff --git a/MechJeb2/MechJebModuleAscentGuidance.cs b/MechJeb2/MechJebModuleAscentGuidance.cs
@@ -545,11 +545,10 @@ private void UpdateStrings()
             }
         }
 
-        private bool advancedSettings = false;
         private void RefreshRateGUI()
         {
             int oldRate = refreshRate;
-            if (advancedSettings = GUILayout.Toggle(advancedSettings,"Advanced Window Settings"))
+            if (GuiUtils.showAdvancedWindowSettings)
                 GuiUtils.SimpleTextBox("Update Interval",refreshRate,"Hz");
             if (oldRate != refreshRate)
             {

diff --git a/MechJeb2/MechJebModuleCustomInfoWindow.cs b/MechJeb2/MechJebModuleCustomInfoWindow.cs
@@ -69,11 +69,10 @@ public virtual void UpdateWindowItems()
             lastRefresh = now;
         }
 
-        private bool advancedSettings = false;
         private void RefreshRateGUI()
         {
             int oldRate = refreshRate;
-            if (advancedSettings = GUILayout.Toggle(advancedSettings,"Advanced Window Settings"))
+            if (GuiUtils.showAdvancedWindowSettings)
                 GuiUtils.SimpleTextBox("Update Interval",refreshRate,"Hz");
             if (oldRate != refreshRate)
             {

diff --git a/MechJeb2/MechJebModuleSettings.cs b/MechJeb2/MechJebModuleSettings.cs
@@ -33,6 +33,9 @@ public MechJebModuleSettings(MechJebCore core) : base(core)
         [ToggleInfoItem("#MechJeb_rssMode", InfoItem.Category.Misc), Persistent(pass = (int)Pass.Global)]//Module disabling does not kill throttle (RSS/RO)
         public bool rssMode = false;
 
+        [Persistent(pass = (int)Pass.Global)]
+        public bool showAdvancedWindowSettings = false;
+
         public override void OnLoad(ConfigNode local, ConfigNode type, ConfigNode global)
         {
             base.OnLoad(local, type, global);
@@ -96,6 +99,9 @@ protected override void WindowGUI(int windowID)
             dontUseDropDownMenu = GUILayout.Toggle(dontUseDropDownMenu, Localizer.Format("#MechJeb_Settings_checkbox1"));//"Replace drop down menu with arrow selector"
             GuiUtils.dontUseDropDownMenu = dontUseDropDownMenu;
 
+            showAdvancedWindowSettings = GUILayout.Toggle(showAdvancedWindowSettings,"Show Advanced Window Settings");
+            GuiUtils.showAdvancedWindowSettings = showAdvancedWindowSettings;
+
             MechJebModuleCustomWindowEditor ed = core.GetComputerModule<MechJebModuleCustomWindowEditor>();
             ed.registry.Find(i => i.id == "Toggle:Settings.hideBrakeOnEject").DrawItem();