取消标识位

开启修改标志位之后，取消失去焦点更新。会导致在编辑中，并失去焦点并来回后，无法编辑
Fixes #18

Author: heartacker

demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml

@@ -25,11 +25,19 @@
         <Style Selector="v|NumericUpDown:invalid">
             <Setter Property="Foreground" Value="red" />
         </Style>
-        <!--
+
+        <Style Selector="v|NumericUpDown:editing">
+            <Setter Property="FontSize" Value="15" />
+        </Style>
+
         <Style Selector="v|NumericUpDown:editing">
-            <Setter Property="FontSize" Value="12" />
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="Foreground" Value="Green" />
+            </Style>
+            <Style Selector="^:invalid /template/ TextBox#PART_TextBox">
+                <Setter Property="Foreground" Value="Red" />
+            </Style>
         </Style>
-        -->
     </UserControl.Styles>
 
     <Grid ColumnDefinitions="350,auto,*" RowDefinitions="auto,*">
@@ -47,6 +55,7 @@
                 Margin="10"
                 HorizontalAlignment="Stretch"
                 >
+                <!--  IsEnableEditingIndicator="{Binding IsEnableEditingIndicator}"  -->
                 <v:VariableBoxUInt
                     Name="numd"
                     Width="{Binding Width}"
@@ -59,7 +68,6 @@
                     HeaderDoubleTaped="Numd_HeaderDoubleTaped"
                     IsAllowDrag="{Binding IsAllowDrag}"
                     IsAllowSpin="{Binding IsAllowSpin}"
-                    IsEnableEditingIndicator="{Binding IsEnableEditingIndicator}"
                     IsEnabled="{Binding IsEnable}"
                     IsReadOnly="{Binding IsReadOnly}"
                     IsShowReadButton="{Binding IsShowReadButton}"
@@ -296,7 +304,7 @@
 
             <CheckBox Content="IsReadOnly" IsChecked="{Binding IsReadOnly}" />
             <CheckBox Content="IsUpdateValueWhenLostFocus" IsChecked="{Binding IsUpdateValueWhenLostFocus}" />
-            <CheckBox Content="IsEnableEditingIndicator" IsChecked="{Binding IsEnableEditingIndicator}" />
+            <!-- <CheckBox Content="IsEnableEditingIndicator" IsChecked="{Binding IsEnableEditingIndicator}" /> -->
             <CheckBox Content="IsShowReadButton" IsChecked="{Binding IsShowReadButton}" />
             <CheckBox Content="IsShowWriteButton" IsChecked="{Binding IsShowWriteButton}" />
 

demo/Ursa.Demo/ViewModels/NumericUpDownDemoViewModel.cs

@@ -51,7 +51,7 @@ public partial class NumericUpDownDemoViewModel : ObservableObject
 
     [ObservableProperty] private bool _IsShowReadButton = true;
     [ObservableProperty] private bool _IsShowWriteButton = true;
-    [ObservableProperty] private bool _IsEnableEditingIndicator = true;
+    // [ObservableProperty] private bool _IsEnableEditingIndicator = true;
 
 
     uint v = 0;

src/VariableBox/Controls/VariableBox/NumericUpDownBase.cs

@@ -190,6 +190,7 @@ public bool IsUpdateValueWhenLostFocus
 
     public bool IsEditingValid { get; protected set; }
 
+#if false
     public static readonly StyledProperty<bool> IsEditingVisiableProperty =
         AvaloniaProperty.Register<NumericUpDown, bool>(nameof(IsEditingVisiable), false);
 
@@ -202,6 +203,7 @@ public bool IsEditingVisiable
         get => GetValue(IsEditingVisiableProperty);
         protected set => SetValue(IsEditingVisiableProperty, value && IsEnableEditingIndicator);
     }
+#endif
 
     public static readonly StyledProperty<bool> IsEditingProperty =
         AvaloniaProperty.Register<NumericUpDown, bool>(nameof(IsEditing), false);
@@ -237,12 +239,13 @@ static NumericUpDown()
         IsShowReadButtonProperty.Changed.AddClassHandler<NumericUpDown, bool>((o, e) => o.OnReadWriteShowChange(e));
         IsShowWriteButtonProperty.Changed.AddClassHandler<NumericUpDown, bool>((o, e) => o.OnReadWriteShowChange(e));
 
-        IsEnableEditingIndicatorProperty.Changed.AddClassHandler<NumericUpDown, bool>((o, e) => o.OnIsEnableEditingIndicatorChanged(e));
+        // IsEnableEditingIndicatorProperty.Changed.AddClassHandler<NumericUpDown, bool>((o, e) => o.OnIsEnableEditingIndicatorChanged(e));
     }
 
     private void OnIsEnableEditingIndicatorChanged(AvaloniaPropertyChangedEventArgs<bool> e)
     {
-        IsEditingVisiable = IsEditing && IsEnableEditingIndicator;
+        // IsEditingVisiable =
+        // IsEditing && IsEnableEditingIndicator;
     }
 
     private void OnReadWriteShowChange(AvaloniaPropertyChangedEventArgs<bool> e)
@@ -367,7 +370,8 @@ private void OnTextBoxTextChanged(object? sender, TextChangedEventArgs e)
     {
         CheckContextIsChangedAndValid((sender as TextBox).Text, ref ed, ref edv);
 
-        IsEditingVisiable = IsEditing = ed;
+        // IsEditingVisiable =
+        IsEditing = ed;
         IsEditingValid = edv;
         UpdatePseudoClasses();
     }

src/VariableBox/Controls/VariableBoxNumeric.axaml

@@ -33,10 +33,11 @@
             <ControlTemplate>
                 <!--  BorderBrush="LightGray"  -->
                 <Border
+                    Name="PART_Border"
                     Margin="{TemplateBinding Margin}"
+                    Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="1"
-                    Background="{TemplateBinding Background}"
                     CornerRadius="{DynamicResource ControlCornerRadius}"
                     >
                     <Grid Background="Transparent" ColumnDefinitions="*,auto">
@@ -101,15 +102,15 @@
                                     Theme="{StaticResource InputClearButton}"
                                     />
                                 -->
-                                <Label
+                                <!-- <Label
                                     Name="PART_Id_IsEditing"
                                     Margin="2,1,2,0"
                                     Background="Transparent"
                                     Content="*"
                                     Foreground="Green"
                                     IsHitTestVisible="False"
                                     IsVisible="{TemplateBinding IsEditingVisiable}"
-                                    />
+                                    />-->
                             </Panel>
                         </ButtonSpinner>
 
@@ -185,7 +186,7 @@
                 <Setter Property="Background" Value="Transparent" />
                 <Setter Property="Opacity" Value="0.5" />
             </Style>
-        </Style> -->
+        </Style>-->
         <Style Selector="^.clearButton, ^.ClearButton">
             <Style Selector="^[IsReadOnly=False]:focus /template/ Button#PART_ClearButton">
                 <Setter Property="IsVisible" Value="True" />
@@ -200,12 +201,17 @@
         </Style>
 
         <!--  IsEditingValid  -->
-        <Style Selector="^:invalid /template/ Label#PART_Id_IsEditing">
-            <Setter Property="Foreground" Value="Red" />
-        </Style>
-        <Style Selector="^:invalid /template/ Label#PART_Id_IsEditing">
-            <Setter Property="Foreground" Value="Red" />
+        <!--
+        <Style Selector="^:editing">
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="Foreground" Value="Green" />
+            </Style>
+            <Style Selector="^:invalid /template/ TextBox#PART_TextBox">
+                <Setter Property="Foreground" Value="Red" />
+            </Style>
         </Style>
+         -->
+
         <!--
         <Style Selector="^[IsEditingValid=true] /template/ Label#PART_Id_IsEditing">
             <Setter Property="Foreground" Value="Green" />