From 89a8a51b800dd1e3fbcfa94193019bc68d1db437 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 5 Jul 2018 17:16:04 +0800
Subject: [PATCH] colorpicker

---
 .gitignore                                |  1 +
 HandyControl/Controls/ColorPicker.xaml    | 18 +-----------------
 HandyControl/Controls/ColorPicker.xaml.cs | 15 ++++-----------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a993721..ef0b0c17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /HandyControlDemo/bin/Debug
 /HandyControlDemo/obj/Debug
 /HandyControl.sln.DotSettings.user
+.vs/HandyControl/DesignTimeBuild/.dtbcache
diff --git a/HandyControl/Controls/ColorPicker.xaml b/HandyControl/Controls/ColorPicker.xaml
index 3aa4cecb..2238d456 100644
--- a/HandyControl/Controls/ColorPicker.xaml
+++ b/HandyControl/Controls/ColorPicker.xaml
@@ -24,22 +24,6 @@
                     <ImageBrush ImageSource="/HandyControl;component/Resources/colorPickerBack.png"/>
                 </Border.Background>
             </Border>
-            <!--<Border CornerRadius="2,2,0,0">
-                <Border.Background>
-                    <LinearGradientBrush EndPoint="1,0.5" StartPoint="0,0.5">
-                        <GradientStop Color="#00FFFFFF" Offset="1"/>
-                        <GradientStop Color="#FFFFFFFF" Offset="0"/>
-                    </LinearGradientBrush>
-                </Border.Background>
-            </Border>
-            <Border CornerRadius="2,2,0,0">
-                <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                        <GradientStop Color="#00FFFFFF" Offset="0"/>
-                        <GradientStop Color="#FF000000" Offset="1"/>
-                    </LinearGradientBrush>
-                </Border.Background>
-            </Border>-->
         </Grid>
         <Border Name="BorderColor" Grid.Row="0" CornerRadius="2,2,0,0" ClipToBounds="True">
             <Canvas Margin="-6">
@@ -67,7 +51,7 @@
             </Grid.ColumnDefinitions>
             <Border Width="60" Height="32" CornerRadius="2" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"></Border>
             <Border Grid.Row="0" Grid.Column="0" Width="60" Height="32" CornerRadius="2" Background="{Binding SelectedBrush,ElementName=UserControlMain}" BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"></Border>
-            <Slider Name="SliderColor" LargeChange="0.01" SmallChange="0.01" Grid.ColumnSpan="2" ValueChanged="SliderColor_OnValueChanged" Value="1" Maximum="1" Background="{StaticResource ColorPickerRainbowBrush}" Margin="10,1,0,0" Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True"></Slider>
+            <Slider Name="SliderColor" LargeChange="0.01" SmallChange="0.01" Grid.ColumnSpan="2" ValueChanged="SliderColor_OnValueChanged" Value="6" Maximum="6" Background="{StaticResource ColorPickerRainbowBrush}" Margin="10,1,0,0" Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True"></Slider>
             <Slider Grid.ColumnSpan="2" IsSnapToTickEnabled="True" Name="SliderOpacity" ValueChanged="SliderOpacity_OnValueChanged" Value="255" Maximum="255" SmallChange="1" Foreground="{Binding SelectedBrushWithoutOpacity,ElementName=UserControlMain}" Background="{StaticResource ColorPickerOpacityBrush}" Margin="10,0,0,0" Grid.Row="0" Grid.Column="1" VerticalAlignment="Bottom" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True"></Slider>
             <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,14,0,0" VerticalAlignment="Top" Visibility="{Binding ShowList[0],ElementName=UserControlMain,Converter={StaticResource Boolean2VisibilityConverter}}">
                 <controls:InfoTextBox Text="{Binding SelectedBrush,ElementName=UserControlMain,Mode=TwoWay,Converter={StaticResource Color2HexStrConverter},UpdateSourceTrigger=LostFocus}" FontSize="10" ShowSmallCornerRadius="True" MaxLength="10" ShowClearButton="False" HorizontalTextAlignment="Center" IsNeedly="False" Height="24" ></controls:InfoTextBox>
diff --git a/HandyControl/Controls/ColorPicker.xaml.cs b/HandyControl/Controls/ColorPicker.xaml.cs
index 22350188..6ee1e329 100644
--- a/HandyControl/Controls/ColorPicker.xaml.cs
+++ b/HandyControl/Controls/ColorPicker.xaml.cs
@@ -40,11 +40,6 @@ namespace HandyControl.Controls
         /// </summary>
         private bool IsNeedUpdateInfo { get; set; } = true;
 
-        /// <summary>
-        ///     颜色分值
-        /// </summary>
-        private const double ColorInterval = 1 / 6.0;
-
         /// <summary>
         ///     颜色选取面板宽度
         /// </summary>
@@ -416,11 +411,11 @@ namespace HandyControl.Controls
                         sub = 255 - common;
                     }
                     var scale = sub / 255.0;
-                    var scaleTotal = ColorInterval * (cIndex - direc) + scale * ColorInterval;
+                    var scaleTotal = cIndex - direc + scale;
                     IsNeedUpdateInfo = false;
                     if (!SliderColor.IsMouseOver && !SliderOpacity.IsMouseOver)
                     {
-                        SliderColor.Value = SliderColor.Maximum * scaleTotal;
+                        SliderColor.Value = scaleTotal;
                     }
                     IsNeedUpdateInfo = true;
                 }
@@ -438,10 +433,8 @@ namespace HandyControl.Controls
         private void SliderColor_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             if (!_isLoaded || !IsNeedUpdateInfo) return;
-            var newValue = e.NewValue;
-            var div = newValue / ColorInterval;
-            var index = Math.Min(5, (int)Math.Floor(newValue / ColorInterval));
-            var sub = div - index;
+            var index = Math.Min(5, (int)Math.Floor(e.NewValue));
+            var sub = e.NewValue - index;
             var range = _colorRangeList[index];
 
             var color = range.GetColor(sub);