Now ModPopupInputs properly react to buttons (#177)

* Now ModPopupInputs properly react to buttons
ow-mods · Jul 12, 2020 · e594e15 · e594e15
1 parent f6485df
commit e594e15
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/OWML.ModHelper.Menus/ModInputCombinationElement.cs b/OWML.ModHelper.Menus/ModInputCombinationElement.cs
@@ -63,8 +63,11 @@ private void SetupButtons()
         {
             var commandObject = new GameObject();
             var commandComponent = commandObject.AddComponent<ModCommandListener>();
-            commandComponent.AddToListener(InputLibrary.interact);
+            commandComponent.AddToListener(InputLibrary.select);
+            commandComponent.AddToListener(InputLibrary.enter);
+            commandComponent.AddToListener(InputLibrary.enter2);
             commandComponent.OnNewlyReleased += OnEditButton;
+            commandComponent.BlockNextRelease();
             YesButton.Title = "Edit";
             YesButton.OnClick += OnEditClick;
 
@@ -78,6 +81,7 @@ private void SetupButtons()
             commandComponent = commandObject.AddComponent<ModCommandListener>();
             commandComponent.AddToListener(deleteCommand);
             commandComponent.OnNewlyReleased += OnDeleteButton;
+            commandComponent.BlockNextRelease();
             NoButton.Title = "Delete";
             NoButton.OnClick += OnDeleteClick;
         }

diff --git a/OWML.ModHelper.Menus/ModMenuWithSelectables.cs b/OWML.ModHelper.Menus/ModMenuWithSelectables.cs
@@ -19,7 +19,7 @@ public class ModMenuWithSelectables : ModPopupMenu, IModMenuWithSelectables
 
         protected ModMenuWithSelectables(IModConsole console) : base(console) { }
 
-        protected virtual void SetupCommands()
+        private void SetupCommands()
         {
             var listenerObject = new GameObject("CombinationMenu_Listener");
             CommandListener = listenerObject.AddComponent<ModCommandListener>();

diff --git a/OWML.ModHelper.Menus/ModPopupInput.cs b/OWML.ModHelper.Menus/ModPopupInput.cs
@@ -1,12 +1,15 @@
 using OWML.Common.Menus;
 using OWML.ModHelper.Events;
+using OWML.ModHelper.Input;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace OWML.ModHelper.Menus
 {
     public abstract class ModPopupInput<T> : ModInput<T>
     {
         protected readonly TwoButtonToggleElement ToggleElement;
+        protected ModCommandListener CommandListener;
 
         public override bool IsSelected => ToggleElement.GetValue<bool>("_amISelected");
 
@@ -23,13 +26,35 @@ protected ModPopupInput(TwoButtonToggleElement toggle, IModMenu menu) : base(tog
             layoutGroup.childForceExpandWidth = true;
 
             buttonParent.GetComponent<LayoutElement>().preferredWidth = 100;
+
+            SetupCommands();
+        }
+
+        private void SetupCommands()
+        {
+            var listenerObject = new GameObject();
+            CommandListener = listenerObject.AddComponent<ModCommandListener>();
+            CommandListener.AddToListener(InputLibrary.select);
+            CommandListener.AddToListener(InputLibrary.enter);
+            CommandListener.AddToListener(InputLibrary.enter2);
+            CommandListener.OnNewlyPressed += OnOpenCommand;
         }
 
         protected void Subscribe(IModButton button)
         {
             button.OnClick += Open;
         }
 
+        protected virtual void OnOpenCommand(SingleAxisCommand command)
+        {
+            if (IsSelected && (command == InputLibrary.select || command == InputLibrary.enter || command == InputLibrary.enter2))
+            {
+                command.ConsumeInput();
+                command.BlockNextRelease();
+                Open();
+            }
+        }
+
         protected abstract void Open();
 
     }