fix some popups appearing underneath menus

ow-mods · Nov 10, 2023 · 4797175 · 4797175
1 parent 530195e
commit 4797175
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLFourChoicePopupMenu.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLFourChoicePopupMenu.cs
@@ -129,9 +129,12 @@ public override void InitializeMenu()
 			_ok1Action.OnSubmitAction += InvokeOk1;
 			_ok2Action.OnSubmitAction += InvokeOk2;
 			_ok3Action.OnSubmitAction += InvokeOk3;
+			// PopupCanvas is disabled after the menus are initialized, and overrideSorting can only be set when it's enabled
+			_menuActivationRoot.gameObject.SetActive(true);
 			_popupCanvas = gameObject.GetAddComponent<Canvas>();
 			_popupCanvas.overrideSorting = true;
 			_popupCanvas.sortingOrder = 30000;
+			_menuActivationRoot.gameObject.SetActive(false);
 			gameObject.GetAddComponent<GraphicRaycaster>();
 			gameObject.GetAddComponent<CanvasGroup>();
 		}

diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
@@ -24,6 +24,18 @@ public override void Awake()
 			this._inputField.DeactivateInputField();
 		}
 
+		public override void InitializeMenu()
+		{
+			base.InitializeMenu();
+
+			// PopupCanvas is disabled after the menus are initialized, and overrideSorting can only be set when it's enabled
+			_menuActivationRoot.gameObject.SetActive(true);
+			_popupCanvas = gameObject.GetAddComponent<Canvas>();
+			_popupCanvas.overrideSorting = true;
+			_popupCanvas.sortingOrder = 30000;
+			_menuActivationRoot.gameObject.SetActive(false);
+		}
+
 		public override Selectable GetSelectOnActivate()
 		{
 			return this._selectOnActivate;

diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLThreeChoicePopupMenu.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLThreeChoicePopupMenu.cs
@@ -117,9 +117,12 @@ public override void InitializeMenu()
 
 			_ok1Action.OnSubmitAction += InvokeOk1;
 			_ok2Action.OnSubmitAction += InvokeOk2;
+			// PopupCanvas is disabled after the menus are initialized, and overrideSorting can only be set when it's enabled
+			_menuActivationRoot.gameObject.SetActive(true);
 			_popupCanvas = gameObject.GetAddComponent<Canvas>();
 			_popupCanvas.overrideSorting = true;
 			_popupCanvas.sortingOrder = 30000;
+			_menuActivationRoot.gameObject.SetActive(false);
 			gameObject.GetAddComponent<GraphicRaycaster>();
 			gameObject.GetAddComponent<CanvasGroup>();
 		}