Add minimize to MainGUI window

Falki-git · Falki-git · commit 096166deb6eb · 2023-10-17T00:53:11.000+02:00
diff --git a/MicroEngineerProject/MicroEngineer/MicroEngineerMod.cs b/MicroEngineerProject/MicroEngineer/MicroEngineerMod.cs
@@ -9,7 +9,7 @@
 
 namespace MicroMod
 {
-    [BepInPlugin("com.micrologist.microengineer", "MicroEngineer", "1.3.2")]
+    [BepInPlugin("com.micrologist.microengineer", "MicroEngineer", "1.4.0")]
     [BepInDependency(SpaceWarpPlugin.ModGuid, SpaceWarpPlugin.ModVer)]
     public class MicroEngineerMod : BaseSpaceWarpPlugin
 	{
@@ -32,7 +32,11 @@ public override void OnInitialized()
                 isOpen =>
                 {
                     if (isOpen)
-                        Manager.Instance.Windows.Find(w => w.GetType() == typeof(MainGuiWindow)).IsFlightActive = isOpen;
+                    {
+                        var mainWindow = Manager.Instance.Windows.Find(w => w is MainGuiWindow) as MainGuiWindow;
+                        mainWindow.IsFlightActive = true;
+                        mainWindow.IsFlightMinimized = false;
+                    }
                     FlightSceneController.Instance.ShowGui = isOpen;
                     Utility.SaveLayout();
                 });
@@ -59,15 +63,29 @@ public void Update()
             {
                 if (Utility.GameState.GameState == GameState.FlightView || Utility.GameState.GameState == GameState.Map3DView)
                 {
-                    bool guiState = FlightSceneController.Instance.ShowGui;
-                    FlightSceneController.Instance.ShowGui = !guiState;
-                    Manager.Instance.Windows.Find(w => w.GetType() == typeof(MainGuiWindow)).IsFlightActive = !guiState;
+                    var mainWindow = Manager.Instance.Windows.Find(w => w is MainGuiWindow) as MainGuiWindow;
+
+                    // if MainGUI is minimized then treat it like it isn't open at all
+                    if (mainWindow.IsFlightMinimized)
+                    {
+                        mainWindow.IsFlightMinimized = false;
+                        mainWindow.IsFlightActive = true;
+                        FlightSceneController.Instance.ShowGui = true;                        
+                    }
+                    else
+                    {
+                        bool guiState = FlightSceneController.Instance.ShowGui;
+                        FlightSceneController.Instance.ShowGui = !guiState;
+                        mainWindow.IsFlightActive = !guiState;
+                    }
+                    Utility.SaveLayout();
                 }
                 else if (Utility.GameState.GameState == GameState.VehicleAssemblyBuilder)
                 {
                     bool guiState = OABSceneController.Instance.ShowGui;
                     OABSceneController.Instance.ShowGui = !guiState;
                     Manager.Instance.Windows.Find(w => w.GetType() == typeof(StageInfoOabWindow)).IsEditorActive = !guiState;
+                    Utility.SaveLayout();
                 }
             }
         }
diff --git a/MicroEngineerProject/MicroEngineer/UI/Controllers/FlightSceneController.cs b/MicroEngineerProject/MicroEngineer/UI/Controllers/FlightSceneController.cs
@@ -25,8 +25,6 @@ public bool ShowGui
             set
             {
                 _showGui = value;
-                
-                GameObject.Find("BTN-MicroEngineerBtn")?.GetComponent<UIValue_WriteBool_Toggle>()?.SetValue(value);
 
                 RebuildUI();
                 
@@ -76,9 +74,12 @@ public static FlightSceneController Instance
         public void InitializeUI()
         {
             //Build MainGui
-            MainGui = Window.CreateFromUxml(Uxmls.Instance.BaseWindow, "MainGui", null, true);
-            MainGuiController mainGuiController = MainGui.gameObject.AddComponent<MainGuiController>();
-            MainGui.rootVisualElement[0].RegisterCallback<PointerMoveEvent>(evt => Utility.ClampToScreenUitk(MainGui.rootVisualElement[0]));
+            if ((Manager.Instance.Windows.Find(w => w is MainGuiWindow) as MainGuiWindow).IsFlightMinimized == false)
+            {
+                MainGui = Window.CreateFromUxml(Uxmls.Instance.BaseWindow, "MainGui", null, true);
+                MainGuiController mainGuiController = MainGui.gameObject.AddComponent<MainGuiController>();
+                MainGui.rootVisualElement[0].RegisterCallback<PointerMoveEvent>(evt => Utility.ClampToScreenUitk(MainGui.rootVisualElement[0]));
+            }
 
             //Build poppedout windows
             foreach (EntryWindow poppedOutWindow in Manager.Instance.Windows.Where(w => w is EntryWindow && ((EntryWindow)w).IsFlightPoppedOut))
diff --git a/MicroEngineerProject/MicroEngineer/UI/Controllers/MainGuiController.cs b/MicroEngineerProject/MicroEngineer/UI/Controllers/MainGuiController.cs
@@ -1,4 +1,5 @@
-﻿using MicroMod;
+﻿using KSP.UI.Binding;
+using MicroMod;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -12,6 +13,7 @@ public class MainGuiController : MonoBehaviour
         public VisualElement Header { get; set; }
         public Button EditWindowsButton { get; set; }
         public Button CloseButton { get; set; }
+        public Button MinimizeButton { get; set; }
         public VisualElement Body { get; set; }
 
         public MainGuiController()
@@ -51,6 +53,8 @@ private void BuildMainGuiHeader()
             var mainGuiHeader = Uxmls.Instance.MainGuiHeader.CloneTree();
             CloseButton = mainGuiHeader.Q<Button>("close-button");
             CloseButton.RegisterCallback<ClickEvent>(OnCloseButton);
+            MinimizeButton = mainGuiHeader.Q<Button>("minimize-button");
+            MinimizeButton.RegisterCallback<ClickEvent>(OnMinimizeButton);
             EditWindowsButton = mainGuiHeader.Q<Button>("editwindows-button");
             EditWindowsButton.RegisterCallback<ClickEvent>(evt => FlightSceneController.Instance.ToggleEditWindows());
             Header.Add(mainGuiHeader);
@@ -72,6 +76,15 @@ private void OnCloseButton(ClickEvent evt)
 
             Utility.SaveLayout();
             FlightSceneController.Instance.ShowGui = false;
+            GameObject.Find("BTN-MicroEngineerBtn")?.GetComponent<UIValue_WriteBool_Toggle>()?.SetValue(false);
+        }
+
+        private void OnMinimizeButton(ClickEvent evt)
+        {
+            MainGuiWindow.IsFlightMinimized = true;
+
+            Utility.SaveLayout();
+            FlightSceneController.Instance.RebuildUI();
         }
     }
 }
diff --git a/MicroEngineerProject/MicroEngineer/Windows/MainGuiWindow.cs b/MicroEngineerProject/MicroEngineer/Windows/MainGuiWindow.cs
@@ -6,5 +6,7 @@ public class MainGuiWindow : BaseWindow
     {
         [JsonProperty]
         public int LayoutVersion;
+        [JsonProperty]
+        public bool IsFlightMinimized;
     }
 }
diff --git a/MicroEngineerProject/Other/minus.png b/MicroEngineerProject/Other/minus.png
diff --git a/MicroEngineerProject/Other/minus.psd b/MicroEngineerProject/Other/minus.psd
diff --git a/README.md b/README.md
@@ -25,11 +25,12 @@ Mod folder will be placed in ..\Kerbal Space Program 2\BepInEx\plugins\
 
 # Usage
 * While in flight or VAB, open the mod window by clicking its entry on the APP BAR
-* Or press ALT + E to toggle windows
+* Or press CTRL + E to toggle windows
 
 ### Flight:
 * Pop out windows and drag the where you want
-* Popped out windows will snap to each other when being near 
+* Minimize the main window to hide irrelevant data
+* Popped out windows will snap to each other when being near
 * Open Edit windows by clicking on the gear icon
 * Edit windows:
   * add or remove any entry from any window any way you like
diff --git a/Staging/BepInEx/plugins/micro_engineer/swinfo.json b/Staging/BepInEx/plugins/micro_engineer/swinfo.json
@@ -5,7 +5,7 @@
     "name": "Micro Engineer",
     "description": "Get in-flight and VAB information about your current vessel",
     "source": "https://github.com/Micrologist/MicroEngineer",
-    "version": "1.3.2",
+    "version": "1.4.0",
 	"version_check": "https://raw.githubusercontent.com/Micrologist/MicroEngineer/main/Staging/BepInEx/plugins/micro_engineer/swinfo.json",
     "dependencies": [
 		{

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace MicroMod`
`11`	`11`	`{`
`12`		`- [BepInPlugin("com.micrologist.microengineer", "MicroEngineer", "1.3.2")]`
	`12`	`+ [BepInPlugin("com.micrologist.microengineer", "MicroEngineer", "1.4.0")]`
`13`	`13`	`[BepInDependency(SpaceWarpPlugin.ModGuid, SpaceWarpPlugin.ModVer)]`
`14`	`14`	`public class MicroEngineerMod : BaseSpaceWarpPlugin`
`15`	`15`	`{`
`@@ -32,7 +32,11 @@ public override void OnInitialized()`
`32`	`32`	`isOpen =>`
`33`	`33`	`{`
`34`	`34`	`if (isOpen)`
`35`		`- Manager.Instance.Windows.Find(w => w.GetType() == typeof(MainGuiWindow)).IsFlightActive = isOpen;`
	`35`	`+ {`
	`36`	`+ var mainWindow = Manager.Instance.Windows.Find(w => w is MainGuiWindow) as MainGuiWindow;`
	`37`	`+ mainWindow.IsFlightActive = true;`
	`38`	`+ mainWindow.IsFlightMinimized = false;`
	`39`	`+ }`
`36`	`40`	`FlightSceneController.Instance.ShowGui = isOpen;`
`37`	`41`	`Utility.SaveLayout();`
`38`	`42`	`});`
`@@ -59,15 +63,29 @@ public void Update()`
`59`	`63`	`{`
`60`	`64`	`if (Utility.GameState.GameState == GameState.FlightView \|\| Utility.GameState.GameState == GameState.Map3DView)`
`61`	`65`	`{`
`62`		`- bool guiState = FlightSceneController.Instance.ShowGui;`
`63`		`- FlightSceneController.Instance.ShowGui = !guiState;`
`64`		`- Manager.Instance.Windows.Find(w => w.GetType() == typeof(MainGuiWindow)).IsFlightActive = !guiState;`
	`66`	`+ var mainWindow = Manager.Instance.Windows.Find(w => w is MainGuiWindow) as MainGuiWindow;`
	`67`	`+`
	`68`	`+ // if MainGUI is minimized then treat it like it isn't open at all`
	`69`	`+ if (mainWindow.IsFlightMinimized)`
	`70`	`+ {`
	`71`	`+ mainWindow.IsFlightMinimized = false;`
	`72`	`+ mainWindow.IsFlightActive = true;`
	`73`	`+ FlightSceneController.Instance.ShowGui = true;`
	`74`	`+ }`
	`75`	`+ else`
	`76`	`+ {`
	`77`	`+ bool guiState = FlightSceneController.Instance.ShowGui;`
	`78`	`+ FlightSceneController.Instance.ShowGui = !guiState;`
	`79`	`+ mainWindow.IsFlightActive = !guiState;`
	`80`	`+ }`
	`81`	`+ Utility.SaveLayout();`
`65`	`82`	`}`
`66`	`83`	`else if (Utility.GameState.GameState == GameState.VehicleAssemblyBuilder)`
`67`	`84`	`{`
`68`	`85`	`bool guiState = OABSceneController.Instance.ShowGui;`
`69`	`86`	`OABSceneController.Instance.ShowGui = !guiState;`
`70`	`87`	`Manager.Instance.Windows.Find(w => w.GetType() == typeof(StageInfoOabWindow)).IsEditorActive = !guiState;`
	`88`	`+ Utility.SaveLayout();`
`71`	`89`	`}`
`72`	`90`	`}`
`73`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,7 @@ public class MainGuiWindow : BaseWindow`
`6`	`6`	`{`
`7`	`7`	`[JsonProperty]`
`8`	`8`	`public int LayoutVersion;`
	`9`	`+ [JsonProperty]`
	`10`	`+ public bool IsFlightMinimized;`
`9`	`11`	`}`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"name": "Micro Engineer",`
`6`	`6`	`"description": "Get in-flight and VAB information about your current vessel",`
`7`	`7`	`"source": "https://github.com/Micrologist/MicroEngineer",`
`8`		`- "version": "1.3.2",`
	`8`	`+ "version": "1.4.0",`
`9`	`9`	`"version_check": "https://raw.githubusercontent.com/Micrologist/MicroEngineer/main/Staging/BepInEx/plugins/micro_engineer/swinfo.json",`
`10`	`10`	`"dependencies": [`
`11`	`11`	`{`