Merge pull request #55 from jholzer/master

Dirkster99 · web-flow · commit 2b3bd4a1d0f3 · 2023-03-24T16:27:53.000+01:00
Bugfix: Format-Text must return parsed value, else value in textbox will be overwritten with "LastEditingNumericValue" if "IsUpdateValueWhenLostFocus" is enabled on lost focus
diff --git a/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ByteUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
 			MouseWheelAccelaratorKey="{Binding AccelModifierKey, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
diff --git a/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/DecimalUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/DoubleUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/DoubleUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/FloatUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/LongUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/NumericUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+			IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/PercentageUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/PercentageUpDownDemo.xaml
@@ -40,6 +40,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MinValue="{Binding MinimumValue, Converter={StaticResource FactorToDoubleConverter}, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
diff --git a/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/SByteUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ShortUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/UIntegerUpDownDemo.xaml
@@ -36,6 +36,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/ULongUpDownDemo.xaml
@@ -35,6 +35,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml b/source/Demo/UpDownDemoLib/Views/UShortUpDownDemo.xaml
@@ -34,6 +34,7 @@
 			IsDisplayLengthFixed="True"
 			IsMouseDragEnabled="{Binding ElementName=IsMouseDragEnabledCheckBox, Path=IsChecked}"
 			IsReadOnly="False"
+            IsUpdateValueWhenLostFocus="True"
 			LargeStepSize="{Binding LargeStepSize, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
 			MaxValue="{Binding MaximumValue}"
 			MinValue="{Binding MinimumValue}"
diff --git a/source/NumericUpDownLib/Base/AbstractBaseUpDown.cs b/source/NumericUpDownLib/Base/AbstractBaseUpDown.cs
@@ -3,6 +3,7 @@ namespace NumericUpDownLib.Base
 	using NumericUpDownLib.Enums;
 	using NumericUpDownLib.Models;
 	using System;
+	using System.Globalization;
 	using System.Windows;
 	using System.Windows.Controls;
 	using System.Windows.Controls.Primitives;
@@ -1159,21 +1160,44 @@ protected string FormatNumber(T number)
         }
 
         /// <summary>
-		/// Checks if the current string entered in the textbox is:
-		/// 1) A valid number (syntax)
-		/// 2) within bounds (Min &lt;= number &lt;= Max )
-		///
-		/// 3) adjusts the string if it appears to be invalid and
-		///
-		/// 4) <paramref name="formatNumber"/> true:
-		///    Applies the FormatString property to format the text in a certain way
-		/// </summary>
-		/// <param name="text"></param>
-		/// <param name="formatNumber"></param>
-		/// <returns>the value of the string with special format</returns>
-		protected abstract T FormatText(string text, bool formatNumber = true);
+        /// Checks if the current string entered in the textbox is:
+        /// 1) A valid number (syntax)
+        /// 2) within bounds (Min &lt;= number &lt;= Max )
+        ///
+        /// 3) adjusts the string if it appears to be invalid and
+        ///
+        /// 4) <paramref name="formatNumber"/> true:
+        ///    Applies the FormatString property to format the text in a certain way
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="formatNumber"></param>
+        /// <returns>the value of the string with special format</returns>
+        protected T FormatText(string text, bool formatNumber = true)
+        {
+            if (_PART_TextBox == null)
+                return Value;
 
-		/// <summary>
+            T number = default;
+            // Does this text represent a valid number ?
+            if (ParseText(text, out number))
+            {
+                number = CoerceValue(number);
+
+                _PART_TextBox.Text = FormatNumber(number);
+                _PART_TextBox.SelectionStart = 0;
+
+                return number;
+            }
+
+            // Reset to last value since string does not appear to represent a number
+            _PART_TextBox.SelectionStart = 0;
+            _PART_TextBox.Text = FormatNumber(Value);
+            return LastEditingNumericValue;
+        }
+
+        protected abstract bool ParseText(string text, out T number);
+
+        /// <summary>
 		/// Verify the text is valid or not while use is typing
 		/// </summary>
 		/// <param name="text"></param>
diff --git a/source/NumericUpDownLib/ByteUpDown.cs b/source/NumericUpDownLib/ByteUpDown.cs
@@ -321,62 +321,18 @@ protected override bool VerifyText(string text, ref Byte tempValue)
 			return false;
 		}
 
-		/// <summary>
-		/// Checks if the current string entered in the textbox is valid
-		/// and conforms to a known format
-		/// (<see cref="AbstractBaseUpDown{T}"/> base method for more details).
-		/// </summary>
-		/// <param name="text"></param>
-		/// <param name="formatNumber"></param>
-		protected override byte FormatText(string text, bool formatNumber = true)
-		{
-			if (_PART_TextBox == null)
-				return Value;
-
-			byte number = 0;
-			// Does this text represent a valid number ?
-			if (byte.TryParse(text, base.NumberStyle,
-							  CultureInfo.CurrentCulture, out number) == true)
-			{
-				// yes -> but is the number within bounds?
-				if (number > MaxValue)
-				{
-					// Larger than allowed maximum
-					_PART_TextBox.Text = FormatNumber(MaxValue);
-					_PART_TextBox.SelectionStart = 0;
-				}
-				else
-				{
-					if (number < MinValue)
-					{
-						// Smaller than allowed minimum
-						_PART_TextBox.Text = FormatNumber(MinValue);
-						_PART_TextBox.SelectionStart = 0;
-					}
-					else
-					{
-						// Number is valid and within bounds, just format if requested
-						if (formatNumber == true)
-							_PART_TextBox.Text = FormatNumber(number);
-					}
-				}
-			}
-			else
-			{
-				// Reset to last value since string does not appear to represent a number
-				_PART_TextBox.SelectionStart = 0;
-				_PART_TextBox.Text = FormatNumber(Value);
-			}
-			return LastEditingNumericValue;
-		}
-
-		/// <summary>
-		/// Determines whether the step size in the <paramref name="value"/> parameter
-		/// is larger 0 (valid) or not.
-		/// </summary>
-		/// <param name="value">returns true for valid values, otherwise false.</param>
-		/// <returns></returns>
-		private static bool IsValidStepSizeReading(object value)
+        protected override bool ParseText(string text, out byte number)
+        {
+            return byte.TryParse(text, base.NumberStyle, CultureInfo.CurrentCulture, out number);
+        }
+
+        /// <summary>
+        /// Determines whether the step size in the <paramref name="value"/> parameter
+        /// is larger 0 (valid) or not.
+        /// </summary>
+        /// <param name="value">returns true for valid values, otherwise false.</param>
+        /// <returns></returns>
+        private static bool IsValidStepSizeReading(object value)
 		{
 			byte v = (byte)value;
 			return (v > 0);
diff --git a/source/NumericUpDownLib/DecimalUpDown.cs b/source/NumericUpDownLib/DecimalUpDown.cs
@@ -322,61 +322,18 @@ protected override bool VerifyText(string text, ref Decimal tempValue)
 			return false;
 		}
 
-		/// <summary>
-		/// Checks if the current string entered in the textbox is valid
-		/// and conforms to a known format
-		/// (<see cref="AbstractBaseUpDown{T}"/> base method for more details).
-		/// </summary>
-		/// <param name="text"></param>
-		/// <param name="formatNumber"></param>
-		protected override decimal FormatText(string text, bool formatNumber = true)
-		{
-			if (_PART_TextBox == null)
-				return Value;
-			decimal number = 0;
-			// Does this text represent a valid number ?
-			if (decimal.TryParse(text, base.NumberStyle,
-								 CultureInfo.CurrentCulture, out number) == true)
-			{
-				// yes -> but is the number within bounds?
-				if (number > MaxValue)
-				{
-					// Larger than allowed maximum
-					_PART_TextBox.Text = FormatNumber(MaxValue);
-					_PART_TextBox.SelectionStart = 0;
-				}
-				else
-				{
-					if (number < MinValue)
-					{
-						// Smaller than allowed minimum
-						_PART_TextBox.Text = FormatNumber(MinValue);
-						_PART_TextBox.SelectionStart = 0;
-					}
-					else
-					{
-						// Number is valid and within bounds, just format if requested
-						if (formatNumber == true)
-							_PART_TextBox.Text = FormatNumber(number);
-					}
-				}
-			}
-			else
-			{
-				// Reset to last value since string does not appear to represent a number
-				_PART_TextBox.SelectionStart = 0;
-				_PART_TextBox.Text = FormatNumber(Value);
-			}
-			return LastEditingNumericValue;
-		}
-
-		/// <summary>
-		/// Determines whether the step size in the <paramref name="value"/> parameter
-		/// is larger 0 (valid) or not.
-		/// </summary>
-		/// <param name="value">returns true for valid values, otherwise false.</param>
-		/// <returns></returns>
-		private static bool IsValidStepSizeReading(object value)
+        protected override bool ParseText(string text, out decimal number)
+        {
+            return decimal.TryParse(text, base.NumberStyle, CultureInfo.CurrentCulture, out number);
+        }
+
+        /// <summary>
+        /// Determines whether the step size in the <paramref name="value"/> parameter
+        /// is larger 0 (valid) or not.
+        /// </summary>
+        /// <param name="value">returns true for valid values, otherwise false.</param>
+        /// <returns></returns>
+        private static bool IsValidStepSizeReading(object value)
 		{
 			decimal v = (decimal)value;
 			return (v > 0);
diff --git a/source/NumericUpDownLib/DoubleUpDown.cs b/source/NumericUpDownLib/DoubleUpDown.cs
@@ -325,53 +325,10 @@ protected override bool VerifyText(string text, ref double tempValue)
 			return false;
 		}
 
-		/// <summary>
-		/// Checks if the current string entered in the textbox is valid
-		/// and conforms to a known format
-		/// (<see cref="AbstractBaseUpDown{T}"/> base method for more details).
-		/// </summary>
-		/// <param name="text"></param>
-		/// <param name="formatNumber"></param>
-		protected override double FormatText(string text, bool formatNumber = true)
-		{
-			if (_PART_TextBox == null)
-				return Value;
-			double number = 0;
-			// Does this text represent a valid number ?
-			if (double.TryParse(text, base.NumberStyle,
-								CultureInfo.CurrentCulture, out number) == true)
-			{
-				// yes -> but is the number within bounds?
-				if (number > MaxValue)
-				{
-					// Larger than allowed maximum
-					_PART_TextBox.Text = FormatNumber(MaxValue);
-					_PART_TextBox.SelectionStart = 0;
-				}
-				else
-				{
-					if (number < MinValue)
-					{
-						// Smaller than allowed minimum
-						_PART_TextBox.Text = FormatNumber(MinValue);
-						_PART_TextBox.SelectionStart = 0;
-					}
-					else
-					{
-						// Number is valid and within bounds, just format if requested
-						if (formatNumber == true)
-							_PART_TextBox.Text = FormatNumber(number);
-					}
-				}
-			}
-			else
-			{
-				// Reset to last value since string does not appear to represent a number
-				_PART_TextBox.SelectionStart = 0;
-				_PART_TextBox.Text = FormatNumber(Value);
-			}
-			return LastEditingNumericValue;
-		}
+        protected override bool ParseText(string text, out double number)
+        {
+            return double.TryParse(text, base.NumberStyle, CultureInfo.CurrentCulture, out number);
+        }
 
 		/// <summary>
 		/// Determines whether the step size in the <paramref name="value"/> parameter
diff --git a/source/NumericUpDownLib/FloatUpDown.cs b/source/NumericUpDownLib/FloatUpDown.cs
diff --git a/source/NumericUpDownLib/LongUpDown.cs b/source/NumericUpDownLib/LongUpDown.cs
diff --git a/source/NumericUpDownLib/NumericUpDown.cs b/source/NumericUpDownLib/NumericUpDown.cs
diff --git a/source/NumericUpDownLib/SByteUpDown.cs b/source/NumericUpDownLib/SByteUpDown.cs
diff --git a/source/NumericUpDownLib/ShortUpDown.cs b/source/NumericUpDownLib/ShortUpDown.cs
diff --git a/source/NumericUpDownLib/UIntegerUpDown.cs b/source/NumericUpDownLib/UIntegerUpDown.cs
diff --git a/source/NumericUpDownLib/ULongUpDown.cs b/source/NumericUpDownLib/ULongUpDown.cs
diff --git a/source/NumericUpDownLib/UShortUpDown.cs b/source/NumericUpDownLib/UShortUpDown.cs
