add in backwards compat for OnInputPopupValidateChar

ow-mods · Oct 11, 2024 · 09af8a9 · 09af8a9
1 parent 866e5c7
commit 09af8a9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git a/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs b/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
@@ -1,12 +1,15 @@
-using UnityEngine.UI;
+using System;
+using UnityEngine.UI;
 
 namespace OWML.Common.Interfaces.Menus
 {
 	public interface IOWMLPopupInputMenu
 	{
-		public delegate bool InputPopupValidateCharEvent(string input, int charIndex, char addedChar);
+		[Obsolete("Use OnValidateChar instead.")]
+		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
 
-		public event InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public delegate bool InputPopupValidateCharEvent(string input, int charIndex, char addedChar);
+		public event InputPopupValidateCharEvent OnValidateChar;
 
 		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,10 @@ public class OWMLPopupInputMenu : PopupMenu, IOWMLPopupInputMenu
 		protected bool _virtualKeyboardOpen;
 
 		public event PopupInputMenu.InputPopupTextChangedEvent OnInputPopupTextChanged;
-		public event IOWMLPopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public event IOWMLPopupInputMenu.InputPopupValidateCharEvent OnValidateChar;
+
+		[Obsolete("Use OnValidateChar instead.")]
+		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
 
 		public override void Awake()
 		{
@@ -152,20 +155,32 @@ private void OnTextFieldChanged()
 
 		private char OnValidateInput(string input, int charIndex, char addedChar)
 		{
-			bool flag = true;
-			if (this.OnInputPopupValidateChar != null)
+			var isValidCharacter = true;
+			if (OnInputPopupValidateChar != null)
+			{
+				var invocationList = OnInputPopupValidateChar.GetInvocationList();
+				for (var i = 0; i < invocationList.Length; i++)
+				{
+					var flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { addedChar });
+					isValidCharacter = isValidCharacter && flag2;
+				}
+			}
+
+			if (OnValidateChar != null && isValidCharacter)
 			{
-				Delegate[] invocationList = this.OnInputPopupValidateChar.GetInvocationList();
-				for (int i = 0; i < invocationList.Length; i++)
+				var invocationList = OnValidateChar.GetInvocationList();
+				for (var i = 0; i < invocationList.Length; i++)
 				{
-					bool flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { input, charIndex, addedChar });
-					flag = flag && flag2;
+					var flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { input, charIndex, addedChar });
+					isValidCharacter = isValidCharacter && flag2;
 				}
 			}
-			if (flag)
+
+			if (isValidCharacter)
 			{
 				return addedChar;
 			}
+
 			return '\0';
 		}
 

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