Add format provider argument to IParseable.Parse()

osu.Framework.Tests/Bindables/BindableDoubleTest.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Globalization;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 
@@ -98,5 +99,18 @@ public void TestPropagationToPlainBindable()
             number.MinValue = 0;
             number.MaxValue = 10;
         }
+
+        [TestCase("1,4", "de-DE", 1.4)]
+        [TestCase("1.400,01", "de-DE", 1400.01)]
+        [TestCase("1 234,57", "ru-RU", 1234.57)]
+        [TestCase("1,094", "fr-FR", 1.094)]
+        [TestCase("1,400.01", "zh-CN", 1400.01)]
+        public void TestParsingLocale(string value, string locale, double expected)
+        {
+            var bindable = new BindableDouble();
+            bindable.Parse(value, CultureInfo.GetCultureInfo(locale));
+
+            Assert.AreEqual(expected, bindable.Value);
+        }
     }
 }

osu.Framework.Tests/Bindables/BindableFloatTest.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Globalization;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 
@@ -85,5 +86,18 @@ public void TestParsingFloat(float value)
 
             Assert.AreEqual(value, bindable.Value);
         }
+
+        [TestCase("1,4", "de-DE", 1.4f)]
+        [TestCase("1.400,01", "de-DE", 1400.01f)]
+        [TestCase("1 234,57", "ru-RU", 1234.57f)]
+        [TestCase("1,094", "fr-FR", 1.094f)]
+        [TestCase("1,400.01", "zh-CN", 1400.01f)]
+        public void TestParsingLocale(string value, string locale, float expected)
+        {
+            var bindable = new BindableFloat();
+            bindable.Parse(value, CultureInfo.GetCultureInfo(locale));
+
+            Assert.AreEqual(expected, bindable.Value);
+        }
     }
 }

osu.Framework/Bindables/Bindable.cs

@@ -20,7 +20,7 @@ namespace osu.Framework.Bindables
     /// A generic implementation of a <see cref="IBindable"/>
     /// </summary>
     /// <typeparam name="T">The type of our stored <see cref="Value"/>.</typeparam>
-    public class Bindable<T> : IBindable<T>, IBindable, IParseable, ISerializableBindable
+    public class Bindable<T> : IBindable<T>, IBindable, ILocalisableParseable, ISerializableBindable
     {
         /// <summary>
         /// An event which is raised when <see cref="Value"/> has changed (or manually via <see cref="TriggerValueChange"/>).
@@ -248,7 +248,8 @@ private void addWeakReference(WeakReference<Bindable<T>> weakReference)
         /// An object deriving T can be parsed, or a string can be parsed if T is an enum type.
         /// </summary>
         /// <param name="input">The input which is to be parsed.</param>
-        public virtual void Parse([CanBeNull] object input)
+        /// <param name="cultureInfo">The preferred culture formatting to be displayed.</param>
+        public virtual void Parse([CanBeNull] object input, [CanBeNull] CultureInfo cultureInfo = null)
         {
             switch (input)
             {
@@ -295,7 +296,7 @@ public virtual void Parse([CanBeNull] object input)
                     if (underlyingType.IsEnum)
                         Value = (T)Enum.Parse(underlyingType, input.ToString().AsNonNull());
                     else
-                        Value = (T)Convert.ChangeType(input, underlyingType, CultureInfo.InvariantCulture);
+                        Value = (T)Convert.ChangeType(input, underlyingType, cultureInfo ?? CultureInfo.InvariantCulture);
 
                     break;
             }

osu.Framework/Bindables/BindableBool.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 
 namespace osu.Framework.Bindables
 {
@@ -12,7 +13,7 @@ public BindableBool(bool value = false)
         {
         }
 
-        public override void Parse(object? input)
+        public override void Parse(object? input, CultureInfo? cultureInfo = null)
         {
             if (input == null) throw new ArgumentNullException(nameof(input));
 
@@ -21,7 +22,7 @@ public override void Parse(object? input)
             else if (input is "0")
                 Value = false;
             else
-                base.Parse(input);
+                base.Parse(input, cultureInfo);
         }
 
         public void Toggle() => Value = !Value;

osu.Framework/Bindables/BindableColour4.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using osu.Framework.Graphics;
 
 namespace osu.Framework.Bindables
@@ -16,7 +17,7 @@ public BindableColour4(Colour4 value = default)
         // 8-bit precision should probably be enough for serialization.
         public override string ToString(string? format, IFormatProvider? formatProvider) => Value.ToHex();
 
-        public override void Parse(object? input)
+        public override void Parse(object? input, CultureInfo? cultureInfo = null)
         {
             if (input == null) throw new ArgumentNullException(nameof(input));
 
@@ -30,7 +31,7 @@ public override void Parse(object? input)
                     break;
 
                 default:
-                    base.Parse(input);
+                    base.Parse(input, cultureInfo);
                     break;
             }
         }

osu.Framework/Bindables/BindableMarginPadding.cs

@@ -17,7 +17,7 @@ public BindableMarginPadding(MarginPadding defaultValue = default)
         {
         }
 
-        public override void Parse(object? input)
+        public override void Parse(object? input, CultureInfo? cultureInfo = null)
         {
             if (input == null) throw new ArgumentNullException(nameof(input));
 
@@ -39,7 +39,7 @@ public override void Parse(object? input)
                     break;
 
                 default:
-                    base.Parse(input);
+                    base.Parse(input, cultureInfo);
                     break;
             }
         }

osu.Framework/Bindables/BindableSize.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Drawing;
+using System.Globalization;
 
 namespace osu.Framework.Bindables
 {
@@ -21,7 +22,7 @@ public BindableSize(Size defaultValue = default)
 
         public override string ToString(string? format, IFormatProvider? formatProvider) => ((FormattableString)$"{Value.Width}x{Value.Height}").ToString(formatProvider);
 
-        public override void Parse(object? input)
+        public override void Parse(object? input, CultureInfo? cultureInfo = null)
         {
             if (input == null) throw new ArgumentNullException(nameof(input));
 
@@ -37,7 +38,7 @@ public override void Parse(object? input)
                     break;
 
                 default:
-                    base.Parse(input);
+                    base.Parse(input, cultureInfo);
                     break;
             }
         }

osu.Framework/Bindables/ILocalisableParseable.cs

@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Globalization;
+
+namespace osu.Framework.Bindables
+{
+    /// <summary>
+    /// Represents a class which can be parsed from an arbitrary object based on locale information.
+    /// </summary>
+    public interface ILocalisableParseable
+    {
+        /// <summary>
+        /// Parse an input into this instance.
+        /// </summary>
+        /// <param name="input">The input which is to be parsed.</param>
+        /// <param name="cultureInfo">The preferred culture formatting to be displayed.</param>
+        void Parse(object input, CultureInfo cultureInfo);
+    }
+}