Changed the name of IsIntegerOnly to HasDecimals, so users won't think there is actually an int behind the scenes doing the work of the NumericUpDown.

feinstein · feinstein · commit 9dd57c97b867 · 2015-07-31T15:31:38.000-03:00
Changed the CoerseValue to remove the decimals to cover cases where the decimal point came not from the keyboard itself.
Fixed the HasDecimalsChanged to not act if the double? is null. It was inserting a 0, where it should be null.
Updated the UI to reflect these changes.
diff --git a/MahApps.Metro/Controls/NumericUpDown.cs b/MahApps.Metro/Controls/NumericUpDown.cs
@@ -142,11 +142,11 @@ private static void IsReadOnlyPropertyChangedCallback(DependencyObject dependenc
             typeof(NumericUpDown),
             new PropertyMetadata(true));
 
-        public static readonly DependencyProperty IsIntegerOnlyProperty = DependencyProperty.Register(
-            "IsIntegerOnly",
+        public static readonly DependencyProperty HasDecimalsProperty = DependencyProperty.Register(
+            "HasDecimals",
             typeof(bool), 
             typeof(NumericUpDown),
-            new FrameworkPropertyMetadata(false, OnIsIntegerOnlyChanged));
+            new FrameworkPropertyMetadata(true, OnHasDecimalsChanged));
         
         private const double DefaultInterval = 1d;
         private const int DefaultDelay = 500;
@@ -444,11 +444,11 @@ private CultureInfo SpecificCultureInfo
         /// </summary>
         [Bindable(true)]
         [Category("Common")]
-        [DefaultValue(false)]
-        public bool IsIntegerOnly
+        [DefaultValue(true)]
+        public bool HasDecimals
         {
-            get { return (bool)GetValue(IsIntegerOnlyProperty); }
-            set { SetValue(IsIntegerOnlyProperty, value); }
+            get { return (bool)GetValue(HasDecimalsProperty); }
+            set { SetValue(HasDecimalsProperty, value); }
         }
 
         /// <summary> 
@@ -671,7 +671,7 @@ protected void OnPreviewTextInput(object sender, TextCompositionEventArgs e)
                 {
                     if (textBox.Text.All(i => i.ToString(equivalentCulture) != numberFormatInfo.NumberDecimalSeparator) || allTextSelected)
                     {
-                        if (!IsIntegerOnly)
+                        if (HasDecimals)
                         {
                             e.Handled = false;
                         }
@@ -821,6 +821,10 @@ private static object CoerceValue(DependencyObject d, object value)
             var numericUpDown = (NumericUpDown)d;
             double val = ((double?)value).Value;
 
+            if (numericUpDown.HasDecimals == false)
+            {
+                val = Math.Truncate(val);
+            }
             if (val < numericUpDown.Minimum)
             {
                 return numericUpDown.Minimum;
@@ -892,17 +896,15 @@ private static void OnValueChanged(DependencyObject d, DependencyPropertyChanged
             numericUpDown.OnValueChanged((double?)e.OldValue, (double?)e.NewValue);
         }
 
-        private static void OnIsIntegerOnlyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void OnHasDecimalsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var numericUpDown = (NumericUpDown)d;
             double? oldValue = numericUpDown.Value;
 
-            if ((bool)e.NewValue == true)
+            if ((bool)e.NewValue == false && numericUpDown.Value != null)
             {
                 numericUpDown.Value = Math.Truncate(numericUpDown.Value.GetValueOrDefault());
             }
-
-            numericUpDown.OnValueChanged(oldValue, numericUpDown.Value);
         }
 
       private static bool ValidateDelay(object value)
diff --git a/samples/MetroDemo/ExampleViews/TextExamples.xaml b/samples/MetroDemo/ExampleViews/TextExamples.xaml
@@ -223,37 +223,38 @@
                                         TextAlignment="Left"
                                         Minimum="0"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
-                                        IsIntegerOnly="{Binding ElementName=IntegerOnlyCheckBox, Path=IsChecked, Mode=TwoWay}"                                                                                
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"                                                                                
                                         Maximum="10" />
 
                 <Label Content='Interval="2"' />
              
-                <CheckBox x:Name="IntegerOnlyCheckBox"
-                          Content="IsIntegerOnly"
+                <CheckBox x:Name="HasDecimalsCheckBox"
+                          Content="HasDecimals"
+                          IsChecked="True"
                           Margin="0,7" />
                 
                 <Controls:NumericUpDown Value="5"
                                         ButtonsAlignment="Left" 
-                                        IsIntegerOnly="{Binding ElementName=IntegerOnlyCheckBox, Path=IsChecked, Mode=TwoWay}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
                                         Interval="2" />
 
                 <Label Content='Interval="5"' />
                 <Controls:NumericUpDown Value="5"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
-                                        IsIntegerOnly="{Binding ElementName=IntegerOnlyCheckBox, Path=IsChecked, Mode=TwoWay}"                                        
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"                                        
                                         Controls:TextBoxHelper.ClearTextButton="True"
                                         ButtonsAlignment="Left"
                                         Interval="5" />
 
                 <Controls:NumericUpDown Margin="{StaticResource ControlMargin}"
                                         Controls:TextBoxHelper.Watermark="No Speedup when long pressed"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
-                                        IsIntegerOnly="{Binding ElementName=IntegerOnlyCheckBox, Path=IsChecked, Mode=TwoWay}"                                        
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"                                        
                                         Speedup="false" />
                 <Controls:NumericUpDown Margin="{StaticResource ControlMargin}"
                                         Controls:TextBoxHelper.Watermark="Speedup when long pressed after 500ms"
-                                        IsIntegerOnly="{Binding ElementName=IntegerOnlyCheckBox, Path=IsChecked, Mode=TwoWay}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
                                         Delay="500"
                                         Speedup="true" />
@@ -264,7 +265,7 @@
                 <Controls:NumericUpDown Value="5"
                                         x:Name="test"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
-                                        IsIntegerOnly="{Binding ElementName=IntegerOnlyCheckBox, Path=IsChecked, Mode=TwoWay}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         StringFormat="pcs. {0:N2} pcs."
                                         Maximum="100" />
                 <Grid Margin="{StaticResource ControlMargin}">
@@ -298,7 +299,7 @@
                 <Controls:NumericUpDown x:Name="StringFormatNumUpDown"
                                         Margin="{StaticResource ControlMargin}"
                                         Value="{Binding ElementName=test, Path=Value, Mode=TwoWay}"
-                                        IsIntegerOnly="{Binding ElementName=IntegerOnlyCheckBox, Path=IsChecked, Mode=TwoWay}"
+                                        HasDecimals="{Binding ElementName=HasDecimalsCheckBox, Path=IsChecked, Mode=TwoWay}"
                                         IsReadOnly="{Binding ElementName=ReadOnlyCheck, Path=IsChecked, Mode=TwoWay}"
                                         Interval=".1"
                                         StringFormat="0,000.00" />

Original file line number	Diff line number	Diff line change
`@@ -142,11 +142,11 @@ private static void IsReadOnlyPropertyChangedCallback(DependencyObject dependenc`
`142`	`142`	`typeof(NumericUpDown),`
`143`	`143`	`new PropertyMetadata(true));`
`144`	`144`
`145`		`- public static readonly DependencyProperty IsIntegerOnlyProperty = DependencyProperty.Register(`
`146`		`- "IsIntegerOnly",`
	`145`	`+ public static readonly DependencyProperty HasDecimalsProperty = DependencyProperty.Register(`
	`146`	`+ "HasDecimals",`
`147`	`147`	`typeof(bool),`
`148`	`148`	`typeof(NumericUpDown),`
`149`		`- new FrameworkPropertyMetadata(false, OnIsIntegerOnlyChanged));`
	`149`	`+ new FrameworkPropertyMetadata(true, OnHasDecimalsChanged));`
`150`	`150`
`151`	`151`	`private const double DefaultInterval = 1d;`
`152`	`152`	`private const int DefaultDelay = 500;`
`@@ -444,11 +444,11 @@ private CultureInfo SpecificCultureInfo`
`444`	`444`	`/// </summary>`
`445`	`445`	`[Bindable(true)]`
`446`	`446`	`[Category("Common")]`
`447`		`- [DefaultValue(false)]`
`448`		`- public bool IsIntegerOnly`
	`447`	`+ [DefaultValue(true)]`
	`448`	`+ public bool HasDecimals`
`449`	`449`	`{`
`450`		`- get { return (bool)GetValue(IsIntegerOnlyProperty); }`
`451`		`- set { SetValue(IsIntegerOnlyProperty, value); }`
	`450`	`+ get { return (bool)GetValue(HasDecimalsProperty); }`
	`451`	`+ set { SetValue(HasDecimalsProperty, value); }`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`/// <summary>`
`@@ -671,7 +671,7 @@ protected void OnPreviewTextInput(object sender, TextCompositionEventArgs e)`
`671`	`671`	`{`
`672`	`672`	`if (textBox.Text.All(i => i.ToString(equivalentCulture) != numberFormatInfo.NumberDecimalSeparator) \|\| allTextSelected)`
`673`	`673`	`{`
`674`		`- if (!IsIntegerOnly)`
	`674`	`+ if (HasDecimals)`
`675`	`675`	`{`
`676`	`676`	`e.Handled = false;`
`677`	`677`	`}`
`@@ -821,6 +821,10 @@ private static object CoerceValue(DependencyObject d, object value)`
`821`	`821`	`var numericUpDown = (NumericUpDown)d;`
`822`	`822`	`double val = ((double?)value).Value;`
`823`	`823`
	`824`	`+ if (numericUpDown.HasDecimals == false)`
	`825`	`+ {`
	`826`	`+ val = Math.Truncate(val);`
	`827`	`+ }`
`824`	`828`	`if (val < numericUpDown.Minimum)`
`825`	`829`	`{`
`826`	`830`	`return numericUpDown.Minimum;`
`@@ -892,17 +896,15 @@ private static void OnValueChanged(DependencyObject d, DependencyPropertyChanged`
`892`	`896`	`numericUpDown.OnValueChanged((double?)e.OldValue, (double?)e.NewValue);`
`893`	`897`	`}`
`894`	`898`
`895`		`- private static void OnIsIntegerOnlyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)`
	`899`	`+ private static void OnHasDecimalsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)`
`896`	`900`	`{`
`897`	`901`	`var numericUpDown = (NumericUpDown)d;`
`898`	`902`	`double? oldValue = numericUpDown.Value;`
`899`	`903`
`900`		`- if ((bool)e.NewValue == true)`
	`904`	`+ if ((bool)e.NewValue == false && numericUpDown.Value != null)`
`901`	`905`	`{`
`902`	`906`	`numericUpDown.Value = Math.Truncate(numericUpDown.Value.GetValueOrDefault());`
`903`	`907`	`}`
`904`		`-`
`905`		`- numericUpDown.OnValueChanged(oldValue, numericUpDown.Value);`
`906`	`908`	`}`
`907`	`909`
`908`	`910`	`private static bool ValidateDelay(object value)`