Merge pull request #6498 from frenzibyte/add-decimal-type

Add input type for decimal numbers

Author: peppy

osu.Framework/Graphics/UserInterface/TextBox.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using JetBrains.Annotations;
@@ -94,9 +95,28 @@ public abstract partial class TextBox : TabbableContainer, IHasCurrentValue<stri
         /// </summary>
         private bool canAddCharacter(char character)
         {
-            return !char.IsControl(character)
-                   && (!InputProperties.Type.IsNumerical() || char.IsAsciiDigit(character))
-                   && CanAddCharacter(character);
+            if (!CanAddCharacter(character))
+                // discard characters explicitly overriden by custom implementation.
+                return false;
+
+            if (char.IsControl(character))
+                // discard control/special characters.
+                return false;
+
+            var currentNumberFormat = CultureInfo.CurrentCulture.NumberFormat;
+
+            switch (InputProperties.Type)
+            {
+                case TextInputType.Decimal:
+                    return char.IsAsciiDigit(character) || currentNumberFormat.NumberDecimalSeparator.Contains(character);
+
+                case TextInputType.Number:
+                case TextInputType.NumericalPassword:
+                    return char.IsAsciiDigit(character);
+
+                default:
+                    return true;
+            }
         }
 
         private bool readOnly;

osu.Framework/Input/TextInputType.cs

@@ -21,10 +21,15 @@ public enum TextInputType
         Code,
 
         /// <summary>
-        /// The text input is numerical.
+        /// The text input is a whole number.
         /// </summary>
         Number,
 
+        /// <summary>
+        /// The text input is numerical with decimal point.
+        /// </summary>
+        Decimal,
+
         /// <summary>
         /// The text input is an email address.
         /// </summary>
@@ -61,19 +66,6 @@ public static bool IsPassword(this TextInputType type)
             }
         }
 
-        public static bool IsNumerical(this TextInputType type)
-        {
-            switch (type)
-            {
-                case TextInputType.Number:
-                case TextInputType.NumericalPassword:
-                    return true;
-
-                default:
-                    return false;
-            }
-        }
-
         public static bool SupportsIme(this TextInputType type) => type == TextInputType.Name || type == TextInputType.Text;
     }
 }

osu.Framework/Platform/SDL3/SDL3Extensions.cs

@@ -1029,6 +1029,7 @@ public static SDL_TextInputType ToSDLTextInputType(this TextInputType type)
                     return SDL_TextInputType.SDL_TEXTINPUT_TYPE_TEXT_USERNAME;
 
                 case TextInputType.Number:
+                case TextInputType.Decimal:
                     return SDL_TextInputType.SDL_TEXTINPUT_TYPE_NUMBER;
 
                 case TextInputType.Password: