Fix EditWindows closing breaking UI

Author: Falki-git

Assets/MicroEngineer/Code/UI/EditWindowsController.cs

@@ -38,6 +38,8 @@ public class EditWindowsController : MonoBehaviour
         public Button MoveUp { get; set; }
         public Button MoveDown { get; set; }
 
+        private bool _windowToggled;
+
         public EditWindowsController()
         { }
 
@@ -55,7 +57,7 @@ private System.Collections.IEnumerator StartInitialization()
             Root = EditWindows.rootVisualElement;
 
             CloseButton = Root.Q<Button>("close-button");
-            CloseButton.RegisterCallback<PointerUpEvent>(_ => CloseWindow());
+            CloseButton.RegisterCallback<PointerUpEvent>(_ => ToggleWindow());
             AvailableScrollView = Root.Q<ScrollView>("available-scrollview");
             AvailableScrollView.StopMouseEventsToGameInputPropagation();
             InstalledScrollView = Root.Q<ScrollView>("installed-scrollview");
@@ -87,6 +89,8 @@ private System.Collections.IEnumerator StartInitialization()
             BuildCategoryDropdown();
             _editableWindows = FlightSceneController.Instance.GetEditableWindows();
             ResetSelectedWindow();
+
+            _windowToggled = true;
         }
 
         public void Update()
@@ -383,11 +387,19 @@ private void RebuildFlightUI()
             FlightSceneController.Instance.RebuildUI();
         }
 
-        public void CloseWindow()
+        public void ToggleWindow() => ToggleWindow(!_windowToggled);
+        public void ToggleWindow(bool state)
         {
-            if (EditWindows != null && EditWindows.gameObject != null)
-                EditWindows.gameObject.DestroyGameObject();
-            GameObject.Destroy(EditWindows);
+            if (state)
+            {
+                Root.style.display = DisplayStyle.Flex;
+            }
+            else
+            {
+                Root.style.display = DisplayStyle.None;
+            }
+            
+            _windowToggled = state;
         }
     }
 }

Assets/MicroEngineer/Code/UI/FlightSceneController.cs

@@ -43,8 +43,8 @@ public bool ShowGui
                 RebuildUI();
 
                 // If UI is closing, close EditWindows as well
-                if (!value && EditWindows != null)
-                    ToggleEditWindows();
+                if (!value && EditWindows != null) 
+                    EditWindows.GetComponent<EditWindowsController>().ToggleWindow(false);
             }
         }
 
@@ -162,6 +162,7 @@ public void DestroyUI()
         public void ToggleEditWindows() => ToggleEditWindows(false);
         public void ToggleEditWindows(bool needToOpenWithSpecificWindowSelected, int editableWindowId = 0)
         {
+            // first time opening the window
             if (EditWindows == null)
             {
                 EditWindows = Window.Create(Uxmls.Instance.InstantiateWindowOptions("EditWindows"), Uxmls.Instance.EditWindows);
@@ -171,16 +172,18 @@ public void ToggleEditWindows(bool needToOpenWithSpecificWindowSelected, int edi
                 _editWindowsController = EditWindows.gameObject.AddComponent<EditWindowsController>();
                 _editWindowsController.SelectedWindowId = editableWindowId;
             }
+            // one of the entry windows wants to open it
             else if (needToOpenWithSpecificWindowSelected)
             {
                 _editWindowsController.SelectedWindowId = editableWindowId;
                 _editWindowsController.ResetSelectedWindow();
+                
+                _editWindowsController.ToggleWindow(true);
             }
+            // main gui wants to toggle the window
             else
             {
-                var controller = EditWindows.GetComponent<EditWindowsController>();
-                controller.CloseWindow();
-                EditWindows = null;
+                EditWindows.GetComponent<EditWindowsController>().ToggleWindow();
             }
         }