Allow for negative numbers

ow-mods · Sep 26, 2024 · 42b3093 · 42b3093
1 parent 4238d94
commit 42b3093
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs b/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
@@ -4,7 +4,9 @@ namespace OWML.Common.Interfaces.Menus
 {
 	public interface IOWMLPopupInputMenu
 	{
-		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public delegate bool InputPopupValidateCharEvent(string input, int charIndex, char addedChar);
+
+		public event InputPopupValidateCharEvent OnInputPopupValidateChar;
 
 		public void EnableMenu(bool value);
 

diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
@@ -15,7 +15,7 @@ public class OWMLPopupInputMenu : PopupMenu, IOWMLPopupInputMenu
 		protected bool _virtualKeyboardOpen;
 
 		public event PopupInputMenu.InputPopupTextChangedEvent OnInputPopupTextChanged;
-		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public event IOWMLPopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
 
 		public override void Awake()
 		{
@@ -158,7 +158,7 @@ private char OnValidateInput(string input, int charIndex, char addedChar)
 				Delegate[] invocationList = this.OnInputPopupValidateChar.GetInvocationList();
 				for (int i = 0; i < invocationList.Length; i++)
 				{
-					bool flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { addedChar });
+					bool flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { input, charIndex, addedChar });
 					flag = flag && flag2;
 				}
 			}

diff --git a/src/OWML.ModHelper.Menus/ModInputMenu.cs b/src/OWML.ModHelper.Menus/ModInputMenu.cs
@@ -75,7 +75,7 @@ private bool OnValidateNumber() =>
 			float.TryParse(_inputMenu.GetInputText(), out _);
 
 		private bool OnValidateCharNumber(char c) =>
-			"0123456789.".Contains("" + c);
+			"0123456789.-".Contains(c.ToString());
 
 		protected override void OnPopupConfirm()
 		{

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -706,10 +706,10 @@ public IOWMLTextEntryElement AddTextEntryInput(Menu menu, string label, string i
 
 			if (isNumeric)
 			{
-				textInputPopup.OnInputPopupValidateChar += c =>
+				textInputPopup.OnInputPopupValidateChar += (string input, int charIndex, char addedChar) =>
 				{
-					var text = textInputPopup.GetInputText() + c;
-					return Regex.IsMatch(text, @"^\d*[,.]?\d*$");
+					var text = input.Insert(charIndex, addedChar.ToString());
+					return Regex.IsMatch(text, @"^-?\d*[,.]?\d*$");
 				};
 			}