From f49e5adf14b36fafa1974db2a5b7ae3454d70baa Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 29 Oct 2018 19:18:12 +0800
Subject: [PATCH] modify color

---
 HandyControl/Controls/{ => Slider}/CompareSlider.cs    | 1 +
 HandyControl/HandyControl.csproj                       | 3 ++-
 HandyControl/Themes/Basic/Colors/Colors.xaml           | 2 +-
 HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml | 2 +-
 HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml  | 2 +-
 HandyControl/Themes/Styles/TreeView.xaml               | 2 +-
 HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml  | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)
 rename HandyControl/Controls/{ => Slider}/CompareSlider.cs (97%)

diff --git a/HandyControl/Controls/CompareSlider.cs b/HandyControl/Controls/Slider/CompareSlider.cs
similarity index 97%
rename from HandyControl/Controls/CompareSlider.cs
rename to HandyControl/Controls/Slider/CompareSlider.cs
index 9f60d8db..d3d588d2 100644
--- a/HandyControl/Controls/CompareSlider.cs
+++ b/HandyControl/Controls/Slider/CompareSlider.cs
@@ -1,6 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
+// ReSharper disable once CheckNamespace
 namespace HandyControl.Controls
 {
     public class CompareSlider : Slider
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 787b92a2..2928d66d 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -53,8 +53,9 @@
     <Compile Include="Controls\NumericUpDown.cs" />
     <Compile Include="Controls\Pagination.cs" />
     <Compile Include="Controls\Attach\IconElement.cs" />
-    <Compile Include="Controls\CompareSlider.cs" />
+    <Compile Include="Controls\Slider\CompareSlider.cs" />
     <Compile Include="Controls\Picker\ColorPicker.cs" />
+    <Compile Include="Controls\Slider\PreviewSlider.cs" />
     <Compile Include="Controls\ScrollViewer.cs" />
     <Compile Include="Controls\Loading\LoadingBase.cs" />
     <Compile Include="Controls\Loading\LoadingCircle.cs" />
diff --git a/HandyControl/Themes/Basic/Colors/Colors.xaml b/HandyControl/Themes/Basic/Colors/Colors.xaml
index ce8e4aad..deb41f2a 100644
--- a/HandyControl/Themes/Basic/Colors/Colors.xaml
+++ b/HandyControl/Themes/Basic/Colors/Colors.xaml
@@ -27,7 +27,7 @@
     <Color x:Key="BackgroundColor">#eeeeee</Color>
     <Color x:Key="RegionColor">#ffffff</Color>
     <Color x:Key="SecondaryRegionColor">#eeeeee</Color>
-    <Color x:Key="ThirdlyRegionColor">#9e9e9e</Color>
+    <Color x:Key="ThirdlyRegionColor">White</Color>
     <Color x:Key="TitleColor">#73a5ff</Color>
     <Color x:Key="SecondaryTitleColor">#5477f5</Color>
 
diff --git a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index 5d27ee9b..472fb1e8 100644
--- a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -487,7 +487,7 @@
                                 <Condition Property="IsSelected" Value="False"/>
                                 <Condition Property="IsMouseOver" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryBorderBrush}"/>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
index 083f7e7a..34a0d79e 100644
--- a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -25,7 +25,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+                <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
             </Trigger>
             <Trigger Property="IsSelected" Value="true">
                 <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/HandyControl/Themes/Styles/TreeView.xaml b/HandyControl/Themes/Styles/TreeView.xaml
index 58e26651..22d47426 100644
--- a/HandyControl/Themes/Styles/TreeView.xaml
+++ b/HandyControl/Themes/Styles/TreeView.xaml
@@ -66,7 +66,7 @@
                                 <Condition Property="IsMouseOver" Value="true"/>
                                 <Condition Property="HasItems" Value="false"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}"/>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}"/>
                         </MultiTrigger>
                         <Trigger Property="IsExpanded" Value="false">
                             <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
diff --git a/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml
index 58e717e3..c84b9048 100644
--- a/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml
@@ -32,7 +32,7 @@
             <Label Content="BackgroundBrush" BorderThickness="0" Background="{DynamicResource BackgroundBrush}" Foreground="{DynamicResource ReverseTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
             <Label Content="RegionBrush" Background="{DynamicResource RegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
             <Label Content="SecondaryRegionBrush" BorderThickness="0" Background="{DynamicResource SecondaryRegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="ThirdlyRegionBrush" BorderThickness="0" Background="{DynamicResource ThirdlyRegionBrush}" Foreground="{DynamicResource TextIconBrush}" Margin="8" HorizontalAlignment="Stretch"/>
+            <Label Content="ThirdlyRegionBrush" Background="{DynamicResource ThirdlyRegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
             <Label Content="TitleBrush" BorderThickness="0" Background="{DynamicResource TitleBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
             <Label Content="DefaultBrush" Background="{DynamicResource DefaultBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
             <Label Content="DarkDefaultBrush" BorderThickness="0" Background="{DynamicResource DarkDefaultBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>