Fix OAB for realsies

SpaceWarpDev · Jun 27, 2023 · 474dc84 · 474dc84
1 parent 957ad03
commit 474dc84
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/SpaceWarp/Backend/UI/Appbar/AppbarBackend.cs b/SpaceWarp/Backend/UI/Appbar/AppbarBackend.cs
@@ -193,7 +193,7 @@ private static GameObject CreateOABTray()
             ?.SetValue(tooltip, "App Tray");
 
         // Clone the tray from the flight UI.
-        var trayButton = GameManager.Instance.Game.UI.GetPopupCanvas().gameObject.GetChild("BTN-App-Tray");
+        var trayButton = GameManager.Instance.Game.UI.GetScaledPopupCanvas().gameObject.GetChild("BTN-App-Tray");
         var oabTray = UnityObject.Instantiate(trayButton.GetChild("appbar-others-group"), oabTrayButton.transform);
         oabTray.name = "OAB-AppTray";
 
@@ -258,7 +258,11 @@ public static void AddOABButton(string buttonText, Sprite buttonIcon, string but
 
         // Add our function call to the toggle.
         var utoggle = appButton.GetComponent<ToggleExtended>();
-        utoggle.onValueChanged.AddListener(state => function(state));
+        utoggle.onValueChanged.AddListener(state =>
+        {
+            Logger.LogInfo($"{buttonId}({state})");
+            function(state);
+        });
 
         // Set the initial state of the button.
         var toggle = appButton.GetComponent<UIValue_WriteBool_Toggle>();
@@ -268,7 +272,7 @@ public static void AddOABButton(string buttonText, Sprite buttonIcon, string but
         void Action() => SetOABTrayState(false);
         appButton.GetComponent<UIAction_Void_Toggle>().BindAction(new DelegateAction((Action)Action));
 
-        Logger.LogInfo($"Added appbar button: {buttonId}");
+        Logger.LogInfo($"Added OAB appbar button: {buttonId}");
     }
 
     private static void SetOABTrayState(bool state)

diff --git a/SpaceWarp/SpaceWarp.csproj b/SpaceWarp/SpaceWarp.csproj
@@ -13,7 +13,7 @@
         <PackageReference Include="BepInEx.BaseLib" Version="5.4.21" Publicize="true" />
         <PackageReference Include="BepInEx.PluginInfoProps" Version="2.1.0" PrivateAssets="all" />
         <PackageReference Include="HarmonyX" Version="2.10.1" />
-        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.2" Publicize="true" PrivateAssets="all" />
+        <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.3" Publicize="true" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
         <PackageReference Include="UitkForKsp2" Version="1.2.0" />

diff --git a/SpaceWarpBuildTemplate/assets/bundles/swconsoleui.bundle b/SpaceWarpBuildTemplate/assets/bundles/swconsoleui.bundle