fix(numberbox): fix compile errors and warnings

lepoco · Mar 29, 2024 · 919c6f8 · 919c6f8
1 parent d7802a6
commit 919c6f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 30 deletions.
diff --git a/src/Wpf.Ui.Demo.Simple/MainWindow.xaml b/src/Wpf.Ui.Demo.Simple/MainWindow.xaml
@@ -33,7 +33,6 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
-            <RowDefinition Height="100" />
         </Grid.RowDefinitions>
 
         <ui:NavigationView x:Name="RootNavigation" Grid.Row="1">
@@ -94,10 +93,5 @@
                 <ContextMenu ItemsSource="{Binding ViewModel.TrayMenuItems, Mode=OneWay}" />
             </tray:NotifyIcon.Menu>
         </tray:NotifyIcon>
-
-        <StackPanel Grid.Row="2">            
-            <ui:NumberBox Value="{Binding Value}"/>
-            <ui:TextBlock Text="{Binding Value}" />
-        </StackPanel>
     </Grid>
 </ui:FluentWindow>
diff --git a/src/Wpf.Ui.Demo.Simple/MainWindow.xaml.cs b/src/Wpf.Ui.Demo.Simple/MainWindow.xaml.cs
@@ -14,19 +14,6 @@ namespace Wpf.Ui.Demo.Simple;
 /// </summary>
 public partial class MainWindow : INotifyPropertyChanged
 {
-    private double _value;
-
-    public double Value
-    {
-        get => _value;
-
-        set
-        {
-            _value = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
-        }
-    }
-
     public MainWindow()
     {
         DataContext = this;

diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs b/src/Wpf.Ui/Controls/NumberBox/NumberBox.cs
@@ -2,7 +2,6 @@
 // If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
-
 // This Source Code is partially based on the source code provided by the .NET Foundation.
 
 using System.Windows.Controls;
@@ -20,8 +19,8 @@ namespace Wpf.Ui.Controls;
 /// <summary>
 /// Represents a control that can be used to display and edit numbers.
 /// </summary>
-//[ToolboxItem(true)]
-//[ToolboxBitmap(typeof(NumberBox), "NumberBox.bmp")]
+// [ToolboxItem(true)]
+// [ToolboxBitmap(typeof(NumberBox), "NumberBox.bmp")]
 public class NumberBox : TextBox
 {
     private bool _valueUpdating;
@@ -80,7 +79,7 @@ public class NumberBox : TextBox
         nameof(Maximum),
         typeof(double),
         typeof(NumberBox),
-        new PropertyMetadata(Double.MaxValue)
+        new PropertyMetadata(double.MaxValue)
     );
 
     /// <summary>
@@ -90,7 +89,7 @@ public class NumberBox : TextBox
         nameof(Minimum),
         typeof(double),
         typeof(NumberBox),
-        new PropertyMetadata(Double.MinValue)
+        new PropertyMetadata(double.MinValue)
     );
 
     /// <summary>
@@ -231,7 +230,7 @@ public double Minimum
     }
 
     /// <summary>
-    /// Gets or sets whether the control will accept and evaluate a basic formulaic expression entered as input.
+    /// Gets or sets a value indicating whether the control will accept and evaluate a basic formulaic expression entered as input.
     /// </summary>
     public bool AcceptsExpression
     {
@@ -312,7 +311,6 @@ protected override void OnKeyUp(KeyEventArgs e)
                     UpdateValueFromText();
                     ValidateValue(Value);
                     MoveCaretToTextEnd();
-                    TriggerValueUpdate();
                 }
 
                 break;
@@ -368,7 +366,7 @@ ControlTemplate newTemplate
         base.OnTemplateChanged(oldTemplate, newTemplate);
 
         // If Text has been set, but Value hasn't, update Value based on Text.
-        if (String.IsNullOrEmpty(Text) && Value != null)
+        if (string.IsNullOrEmpty(Text) && Value != null)
         {
             SetCurrentValue(ValueProperty, null);
         }
@@ -391,7 +389,7 @@ protected override void OnLostFocus(RoutedEventArgs e)
     /// </summary>
     protected virtual void OnValueChanged(DependencyObject d, double? oldValue)
     {
-        var newValue = Value;
+        double? newValue = Value;
 
         if (Equals(newValue, oldValue))
         {
@@ -425,7 +423,7 @@ private void ValidateValue(double? newValue)
         // Correct the text from value
         if (Value is null && Text.Length > 0)
         {
-            SetCurrentValue(TextProperty, String.Empty);
+            SetCurrentValue(TextProperty, string.Empty);
         }
         else if (GetParser().ParseDouble(Text.Trim()) != Value)
         {
@@ -444,7 +442,7 @@ private void StepValue(double? change)
         );
 #endif
 
-        var newValue = Value ?? 0;
+        double newValue = Value ?? 0;
 
         if (change is not null)
         {