Fixed bug with order of registering new panels

cpvrlab · Mar 4, 2024 · 4271a20 · 4271a20
1 parent a83419a
commit 4271a20
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Scripts/UI/HandMenu/HandMenuController.cs b/Scripts/UI/HandMenu/HandMenuController.cs
@@ -22,6 +22,7 @@ public class HandMenuController : MonoBehaviour
 
     [HideInInspector] public bool openLastPanel;
     MenuPanel m_lastPanel = null;
+    bool m_initialized = false;
     EventTrigger.Entry m_hover;
     EventTrigger.Entry m_click;
     EventTrigger.Entry m_deselect;
@@ -92,7 +93,9 @@ public void OpenMainPanel()
 
     public void RegisterPanel(MenuPanel panel)
     {
-        if (panel.TryGetComponent<MainPanel>(out var _)) return;
+        // if (panel.TryGetComponent<MainPanel>(out var _)) return;
+        if (!m_initialized)
+            InitializeMainPanel();
 
         panel.transform.SetParent(transform);
         panel.transform.SetPositionAndRotation(_panels.First().transform.position, _panels.First().transform.rotation);
@@ -130,6 +133,16 @@ public void UnregisterDynamicPanels()
         }
     }
 
+    void InitializeMainPanel()
+    {
+        if (_panels.First().TryGetComponent<MainPanel>(out var mainPanel))
+        {
+            m_initialized = true;
+            RegisterPanel(_panels.First());
+            mainPanel.SetHandMenuController(this);
+        }
+    }
+
     void CloseAllPanels()
     {
         foreach (var panel in _panels) panel.gameObject.SetActive(false);

diff --git a/Scripts/UI/HandMenu/MainPanel.cs b/Scripts/UI/HandMenu/MainPanel.cs
@@ -53,4 +53,6 @@ public void RemovePanelButton(MenuPanel panel)
         m_menuButtonDictionary.Remove(panel);
         Destroy(button.gameObject);
     }
+
+    public void SetHandMenuController(HandMenuController controller) => handMenuController = controller;
 }