Fix button errors.

agm-114 · Nov 1, 2024 · 96d81be · 96d81be
1 parent af85f5d
commit 96d81be
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 17 deletions.
diff --git a/AGMLIB/Dynamic Systems/DynamicButtonState.cs b/AGMLIB/Dynamic Systems/DynamicButtonState.cs
@@ -29,7 +29,7 @@ class ForcedButtonState
 
     protected void Start()
     {
-
+       
         for (int i = 0; i < LockButtonNames.Count; i++)
         {
             ForcedButtonState newstate = new();
@@ -76,6 +76,7 @@ protected override void FixedUpdate()
             }
             if (forcedButtonState.Index < 0 && forcedButtonState.State.Length > 0)
                 forcedButtonState.Index = button.States.FindIndex(a => a == forcedButtonState.State);
+            //Debug.LogError("forcing state change");
             button.ForceButtonChange(forcedButtonState.Index);
         }
 

diff --git a/AGMLIB/Dynamic Systems/UI/ShipInfoButton.cs b/AGMLIB/Dynamic Systems/UI/ShipInfoButton.cs
@@ -1,4 +1,5 @@
-using static UI.SequentialButton;
+using static Game.Orders.Tasks.OrderTask;
+using static UI.SequentialButton;
 using TooltipTrigger = UI.TooltipTrigger;
 
 public class ShipInfoButton : ShipState
@@ -28,6 +29,8 @@ public void HandleButtonChanged(int value)
         => SelectedOption = value;
     public void ForceButtonChange(int value)
     {
+        if (value == SelectedOption)
+            return;
         if (value < 0)
             value = SelectedOption;
         HandleButtonChanged(value);
@@ -46,36 +49,45 @@ public class ButtonData
 {
     public GameObject GameObject;
     public ShipInfoButton ButtonState;
-    public SequentialButton Button => GameObject.GetComponentInChildren<SequentialButton>();
+    public SequentialButton? Button => FindButton();
     SequentialButtonEvent OnValueChanged => Button.OnValueChanged;
     //RectTransform parentTransform => GameObject.transform.parent.GetComponent<RectTransform>();
-    LayoutElement Layout => GameObject.transform.parent.GetComponent<LayoutElement>();
+    //LayoutElement Layout => GameObject.transform.parent.GetComponent<LayoutElement>();
     TextMeshProUGUI Text => GameObject.GetComponentInChildren<TextMeshProUGUI>();
 
     TooltipTrigger Tooltip => Common.GetVal<TooltipTrigger>(Button, "_tooltip") ?? GameObject.GetComponentInChildren<TooltipTrigger>();
 
-    public ButtonData(SequentialButton template, ShipInfoButton buttondata)
+    public SequentialButton? FindButton()
     {
-        ButtonState = buttondata;
-        Transform templatetransform = template.gameObject.transform.parent;
-        GameObject = UnityEngine.Object.Instantiate(templatetransform.gameObject, templatetransform.parent);
-        Setup();
+        if (GameObject == null)
+            return null;
+        return GameObject.GetComponentInChildren<SequentialButton>();
     }
 
-    void Setup()
+    public void Setup(SequentialButton template, ShipInfoButton buttondata)
     {
+        ButtonState = buttondata;
+        Transform templatetransform = template.gameObject.transform.parent;
+        GameObject = UnityEngine.Object.Instantiate(templatetransform.gameObject, templatetransform.parent);
         ButtonState.Data = this;
         Text.text       = ButtonState.ButtonName;
         GameObject.name = ButtonState.ButtonName;
         Tooltip.Text   =  ButtonState.TooltipString;
-        Layout.minWidth = 550 / 3 * 4;
+        //Layout.minWidth = 550 / 3 * 4;
         OnValueChanged.RemoveAllListeners();
         Common.SetVal(Button, "_options", ButtonState.Options);
         Common.SetVal(Button, "_originalTooltip", ButtonState.TooltipString);
         ButtonState.ForceButtonChange(ButtonState.SelectedOption);
         //Button.SetOptionWithoutNotify(ButtonState.SelectedOption);
         OnValueChanged.AddListener(ButtonState.HandleButtonChanged);
     }
+
+    public static void Resize(SequentialButton template, int extrabuttons = 0)
+    {
+        LayoutElement Layout = template.gameObject.transform.parent.GetComponent<LayoutElement>();
+        if(Layout != null) 
+            Layout.minWidth = 550 / 3 * (3 + (int)Math.Ceiling(extrabuttons / 2.0));
+    }
 }
 
 //Button
@@ -84,19 +96,26 @@ void Setup()
 [HarmonyPatch(typeof(ShipInfoBar), "MatchAllButtons")]
 class ShipInfoBarMatchAllButtons
 {
-    static Dictionary<string, ButtonData> buttons = new();
+    static Dictionary<string, ButtonData> uibuttons = new();
 
     static void Prefix(ShipInfoBar __instance, SequentialButton ____battleshort)
     {
         ShipController _primaryShip = Common.GetVal<ShipController>(__instance, "_primaryShip");
-        foreach (var button in buttons)
+        foreach (var button in uibuttons)
             if (button.Value != null && button.Value.GameObject != null)
                 UnityEngine.Object.Destroy(button.Value.GameObject);
-        buttons.Clear();
-        foreach (ShipInfoButton infobut in _primaryShip.GetComponentsInChildren<ShipInfoButton>())
+        uibuttons.Clear();
+
+        ShipInfoButton[] shipbuttons = _primaryShip.GetComponentsInChildren<ShipInfoButton>();
+
+        ButtonData.Resize(____battleshort, shipbuttons.Count());
+
+        foreach (ShipInfoButton infobut in shipbuttons)
         {
-            ButtonData newbutton = new(____battleshort, infobut);
-            buttons.Add(newbutton.ButtonState.ButtonName, newbutton);
+            ButtonData newbutton = new();
+            newbutton.Setup(____battleshort, infobut);
+            uibuttons.Add(newbutton.ButtonState.ButtonName, newbutton);
         }
+
     }
 }