From 99874a418f1aa513558fdd82ebea0a5dbfa31d31 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 19 Dec 2019 01:05:08 +0800
Subject: [PATCH] fixed #259

---
 .../Themes/Styles/DataGrid.xaml               |  2 +-
 .../Themes/Styles/DataGrid.xaml               |  2 +-
 .../Themes/Styles/DataGrid.xaml               |  2 +-
 .../HandyControlDemo_Shared/App.xaml.cs       |  5 +--
 .../Tools/Converter/String2BrushConverter.cs  |  2 +-
 .../Controls/Input/PasswordBox.cs             |  2 +-
 .../HandyControl_Shared/Data/ColorRange.cs    |  2 +-
 .../HandyControl_Shared/Data/ResourceToken.cs |  2 ++
 .../Expression/Drawing/CommonExtensions.cs    |  4 +--
 .../HandyControl_Shared.projitems             |  1 +
 .../Themes/Basic/Converters.xaml              |  1 +
 .../Tools/Converter/Color2HexStrConverter.cs  |  6 ++--
 .../Tools/Converter/DoubleMinConverter.cs     | 31 +++++++++++++++++++
 .../Tools/Extension/StringExtension.cs        |  2 +-
 .../Tools/Helper/ResourceHelper.cs            |  2 +-
 .../Tools/Helper/SingleOpenHelper.cs          |  4 +--
 16 files changed, 53 insertions(+), 17 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs

diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml b/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml
index f0e986a1..9a91dab7 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml
+++ b/src/Core_30/HandyControl_Core_30/Themes/Styles/DataGrid.xaml
@@ -293,7 +293,7 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
                                         <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                                         <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1"/>
                                         <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
index 8137cf91..770327aa 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -294,7 +294,7 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
                                         <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                                         <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1"/>
                                         <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml
index 93dade9b..f51d0ae3 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml
+++ b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/DataGrid.xaml
@@ -293,7 +293,7 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
+                                        <Button Command="{x:Static DataGrid.SelectAllCommand}" Margin="0,0,0,6" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}"/>
                                         <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
                                         <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1"/>
                                         <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index 6ba5a34f..b6205ec7 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -15,9 +15,10 @@ namespace HandyControlDemo
 {
     public partial class App
     {
-        // ReSharper disable once NotAccessedField.Local
-        [SuppressMessage("代码质量", "IDE0052:删除未读的私有成员", Justification = "<挂起>")]
+#pragma warning disable IDE0052
+        [SuppressMessage("ReSharper", "NotAccessedField.Local")] 
         private static Mutex AppMutex;
+#pragma warning restore IDE0052
 
         protected override void OnStartup(StartupEventArgs e)
         {
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs b/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
index e837c305..e2fcc4cc 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
@@ -10,7 +10,7 @@ namespace HandyControlDemo.Tools.Converter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return value is string str ? ResourceHelper.GetResource<Brush>(str) : default(Brush);
+            return value is string str ? ResourceHelper.GetResource<Brush>(str) : default;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
index 56c68892..1c2037aa 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
@@ -227,7 +227,7 @@ namespace HandyControl.Controls
                 if (_passwordChar != default(char))
                 {
                     ActualPasswordBox.PasswordChar = _passwordChar;
-                    _passwordChar = default(char);
+                    _passwordChar = default;
                 }
             }
 
diff --git a/src/Shared/HandyControl_Shared/Data/ColorRange.cs b/src/Shared/HandyControl_Shared/Data/ColorRange.cs
index 3db15cb3..a5586172 100644
--- a/src/Shared/HandyControl_Shared/Data/ColorRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/ColorRange.cs
@@ -67,7 +67,7 @@ namespace HandyControl.Data
         /// <returns></returns>
         public Color GetColor(double range)
         {
-            if (range < 0 || range > 1) return default(Color);
+            if (range < 0 || range > 1) return default;
             return Color.FromArgb((byte)(_color1.A - _subColorArr[0] * range), (byte)(_color1.R - _subColorArr[1] * range),
                 (byte)(_color1.G - _subColorArr[2] * range), (byte)(_color1.B - _subColorArr[3] * range));
         }
diff --git a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
index 7fdbef09..0b2bfcae 100644
--- a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
+++ b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
@@ -192,6 +192,8 @@
 
         public const string Double2GridLengthConverter = nameof(Double2GridLengthConverter);
 
+        public const string DoubleMinConverter = nameof(DoubleMinConverter);
+
         #endregion
 
         #region Effect
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
index 8abc90c0..723cd864 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
@@ -83,7 +83,7 @@ namespace HandyControl.Expression.Drawing
                 return false;
             }
 
-            if ((list is List<T> list2) && (factory == null))
+            if ((list is List<T> list2) && factory == null)
             {
                 list2.AddRange(new T[count - list.Count]);
             }
@@ -91,7 +91,7 @@ namespace HandyControl.Expression.Drawing
             {
                 for (var i = list.Count; i < count; i++)
                 {
-                    list.Add((factory == null) ? default(T) : factory());
+                    list.Add(factory == null ? default : factory());
                 }
             }
             return true;
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index cea84005..b6842277 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -64,6 +64,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\ColLayoutConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\CornerRadiusSplitConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Double2GridLengthConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\DoubleMinConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Number2PercentageConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\RectangleCircularConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\ThicknessSplitConverter.cs" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
index ef70bbea..209ee47b 100644
--- a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
@@ -24,4 +24,5 @@
     <converter:CornerRadiusSplitConverter x:Key="CornerRadiusSplitConverter"/>
     <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter"/>
     <converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter" />
+    <converter:DoubleMinConverter x:Key="DoubleMinConverter" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
index 3a3bfc10..661be69c 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
@@ -30,11 +30,11 @@ namespace HandyControl.Tools.Converter
                 }
                 catch
                 {
-                    return new SolidColorBrush(default(Color));
+                    return new SolidColorBrush(default);
                 }
-                return new SolidColorBrush(default(Color));
+                return new SolidColorBrush(default);
             }
-            return new SolidColorBrush(default(Color));
+            return new SolidColorBrush(default);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
new file mode 100644
index 00000000..3a1b2df7
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Tools.Converter
+{
+    public class DoubleMinConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is double doubleValue)
+            {
+                if (parameter is string str)
+                {
+                    var minValue = str.Value<double>();
+                    return doubleValue < minValue ? minValue : doubleValue;
+                }
+
+                return doubleValue < .0 ? .0 : doubleValue;
+            }
+
+            return .0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
index 854f767e..9cbe5e7a 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
@@ -13,7 +13,7 @@ namespace HandyControl.Tools.Extension
             }
             catch
             {
-                return default(T);
+                return default;
             }
         }
 
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
index 1cde8a3d..a7518c02 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
@@ -47,7 +47,7 @@ namespace HandyControl.Tools
                 return resource;
             }
 
-            return default(T);
+            return default;
         }
 
         /// <summary>
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
index 49a6c875..f8594ac1 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
@@ -21,7 +21,7 @@ namespace HandyControl.Tools
         {
             var typeStr = typeof(T).FullName;
 
-            if (string.IsNullOrEmpty(typeStr)) return default(T);
+            if (string.IsNullOrEmpty(typeStr)) return default;
 
             var temp = new T();
             if (!OpenDic.Keys.Contains(typeStr))
@@ -36,7 +36,7 @@ namespace HandyControl.Tools
                 OpenDic[typeStr] = temp;
                 return temp;
             }
-            return default(T);
+            return default;
         }
     }
 }
\ No newline at end of file