made sure PopupInput will be reselected after Popup gets closed even …

…if opened by mouse
ow-mods · Jul 14, 2020 · 4dfbe42 · 4dfbe42
1 parent 4b7f678
commit 4dfbe42
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/OWML.ModHelper.Menus/ModComboInput.cs b/OWML.ModHelper.Menus/ModComboInput.cs
@@ -64,6 +64,7 @@ private void UpdateLayout(string currentCombination)
 
         protected override void Open()
         {
+            base.Open();
             InputMenu.Title = Menu is IModConfigMenu menu ? $"{menu.Title}.{Title}" : Title;
             InputMenu.FillMenu(_combination);
             InputMenu.OnConfirm += OnConfirm;

diff --git a/OWML.ModHelper.Menus/ModNumberInput.cs b/OWML.ModHelper.Menus/ModNumberInput.cs
@@ -14,6 +14,7 @@ public ModNumberInput(TwoButtonToggleElement element, IModMenu menu, IModInputMe
 
         protected override void Open()
         {
+            base.Open();
             InputMenu.OnConfirm += OnConfirm;
             InputMenu.OnCancel += OnCancel;
             InputMenu.Open(InputType.Number, Value.ToString());

diff --git a/OWML.ModHelper.Menus/ModPopupInput.cs b/OWML.ModHelper.Menus/ModPopupInput.cs
@@ -4,6 +4,7 @@
 using OWML.ModHelper.Input;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.EventSystems;
 
 namespace OWML.ModHelper.Menus
 {
@@ -61,7 +62,9 @@ protected virtual void OnOpenCommand(SingleAxisCommand command)
             }
         }
 
-        protected abstract void Open();
-
+        protected virtual void Open()
+        {
+            EventSystem.current.SetSelectedGameObject(ToggleElement.gameObject); // make sure it gets selected after popup closes
+        }
     }
 }
diff --git a/OWML.ModHelper.Menus/ModTextInput.cs b/OWML.ModHelper.Menus/ModTextInput.cs
@@ -13,6 +13,7 @@ public ModTextInput(TwoButtonToggleElement element, IModMenu menu, IModInputMenu
 
         protected override void Open()
         {
+            base.Open();
             InputMenu.OnConfirm += OnConfirm;
             InputMenu.OnCancel += OnCancel;
             InputMenu.Open(InputType.Text, Value);