From 44abdd9ba4f1370113794e028589179664feba21 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Fri, 8 Mar 2024 09:32:51 +0100 Subject: [PATCH 1/2] fix the close buttons --- src/MicroEngineer/MicroEngineerPlugin.cs | 1 - src/MicroEngineer/UI/MainGuiController.cs | 2 +- src/MicroEngineer/UI/StageInfoOABController.cs | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/MicroEngineer/MicroEngineerPlugin.cs b/src/MicroEngineer/MicroEngineerPlugin.cs index 4c52661..8a76f82 100644 --- a/src/MicroEngineer/MicroEngineerPlugin.cs +++ b/src/MicroEngineer/MicroEngineerPlugin.cs @@ -31,7 +31,6 @@ public class MicroEngineerPlugin : BaseSpaceWarpPlugin // AppBar button IDs internal const string ToolbarFlightButtonID = "BTN-MicroEngineerFlight"; internal const string ToolbarOabButtonID = "BTN-MicroEngineerOAB"; - internal const string ToolbarKscButtonID = "BTN-MicroEngineerKSC"; public Coroutine MainUpdateLoop; diff --git a/src/MicroEngineer/UI/MainGuiController.cs b/src/MicroEngineer/UI/MainGuiController.cs index 6f21d53..9f91565 100644 --- a/src/MicroEngineer/UI/MainGuiController.cs +++ b/src/MicroEngineer/UI/MainGuiController.cs @@ -78,7 +78,7 @@ private void OnCloseButton(ClickEvent evt) Utility.SaveLayout(); FlightSceneController.Instance.ShowGui = false; - GameObject.Find("BTN-MicroEngineerBtn")?.GetComponent()?.SetValue(false); + GameObject.Find(MicroEngineerPlugin.ToolbarFlightButtonID)!.GetComponent()!.SetValue(false); } private void OnMinimizeButton(ClickEvent evt) diff --git a/src/MicroEngineer/UI/StageInfoOABController.cs b/src/MicroEngineer/UI/StageInfoOABController.cs index 45e8f98..2fa885b 100644 --- a/src/MicroEngineer/UI/StageInfoOABController.cs +++ b/src/MicroEngineer/UI/StageInfoOABController.cs @@ -1,4 +1,5 @@ using BepInEx.Logging; +using KSP.UI.Binding; using MicroEngineer.Entries; using MicroEngineer.Managers; using MicroEngineer.Utilities; @@ -206,8 +207,9 @@ private void OnCloseButton(ClickEvent evt) { StageInfoOABWindow.IsEditorActive = false; Utility.SaveLayout(); - OABSceneController.Instance.ShowGui = false; - } + OABSceneController.Instance.ShowGui = false; + GameObject.Find(MicroEngineerPlugin.ToolbarOabButtonID)!.GetComponent()!.SetValue(false); + } public void InitializeControl(BaseEntryControl control, BaseEntry entry, bool subscribeToValueChanges = true) { From d4367da2b61b40026cb02b1b4d6f56676173f3af Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Fri, 8 Mar 2024 09:35:06 +0100 Subject: [PATCH 2/2] cleanup after vs --- src/MicroEngineer/UI/StageInfoOABController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MicroEngineer/UI/StageInfoOABController.cs b/src/MicroEngineer/UI/StageInfoOABController.cs index 2fa885b..0dc151b 100644 --- a/src/MicroEngineer/UI/StageInfoOABController.cs +++ b/src/MicroEngineer/UI/StageInfoOABController.cs @@ -207,9 +207,9 @@ private void OnCloseButton(ClickEvent evt) { StageInfoOABWindow.IsEditorActive = false; Utility.SaveLayout(); - OABSceneController.Instance.ShowGui = false; - GameObject.Find(MicroEngineerPlugin.ToolbarOabButtonID)!.GetComponent()!.SetValue(false); - } + OABSceneController.Instance.ShowGui = false; + GameObject.Find(MicroEngineerPlugin.ToolbarOabButtonID)!.GetComponent()!.SetValue(false); + } public void InitializeControl(BaseEntryControl control, BaseEntry entry, bool subscribeToValueChanges = true) {