From 8fed1f30f0ef19703a1e4fc7dddd12aab363012a Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 11 May 2023 21:37:05 -0400
Subject: [PATCH] Always enable ColorSlider.IsPerceptive

This works-around #11271 and stabilizes the API. It can be revisited later.
---
 .../Themes/Fluent/ColorPicker.xaml                            | 4 +++-
 .../Themes/Fluent/ColorView.xaml                              | 4 +++-
 .../Themes/Simple/ColorPicker.xaml                            | 4 +++-
 .../Themes/Simple/ColorView.xaml                              | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
index bbb3c0c01a..f3100a648a 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
@@ -114,7 +114,7 @@
                                               AutomationProperties.Name="Third Component"
                                               Grid.Column="0"
                                               IsAlphaVisible="False"
-                                              IsPerceptive="False"
+                                              IsPerceptive="True"
                                               Orientation="Vertical"
                                               ColorModel="Hsva"
                                               ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
@@ -503,6 +503,7 @@
       </ControlTemplate>
     </Setter>
 
+    <!--
     <Style Selector="^ /template/ primitives|ColorSlider#ColorSpectrumThirdComponentSlider[ColorComponent=Component1]">
       <Setter Property="IsPerceptive" Value="True" />
     </Style>
@@ -516,6 +517,7 @@
     <Style Selector="^ /template/ primitives|ColorSlider#Component3Slider[ColorModel=Rgba]">
       <Setter Property="IsPerceptive" Value="False" />
     </Style>
+    -->
 
   </ControlTheme>
 
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index 6159a96cc5..8793467b36 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -361,7 +361,7 @@
                                         AutomationProperties.Name="Third Component"
                                         Grid.Column="0"
                                         IsAlphaVisible="False"
-                                        IsPerceptive="False"
+                                        IsPerceptive="True"
                                         Orientation="Vertical"
                                         ColorModel="Hsva"
                                         ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
@@ -747,6 +747,7 @@
       </ControlTemplate>
     </Setter>
 
+    <!--
     <Style Selector="^ /template/ primitives|ColorSlider#ColorSpectrumThirdComponentSlider[ColorComponent=Component1]">
       <Setter Property="IsPerceptive" Value="True" />
     </Style>
@@ -760,6 +761,7 @@
     <Style Selector="^ /template/ primitives|ColorSlider#Component3Slider[ColorModel=Rgba]">
       <Setter Property="IsPerceptive" Value="False" />
     </Style>
+    -->
 
   </ControlTheme>
 
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
index 82c98e22f7..d9ba8bb9d2 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
@@ -113,7 +113,7 @@
                                               AutomationProperties.Name="Third Component"
                                               Grid.Column="0"
                                               IsAlphaVisible="False"
-                                              IsPerceptive="False"
+                                              IsPerceptive="True"
                                               Orientation="Vertical"
                                               ColorModel="Hsva"
                                               ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
@@ -502,6 +502,7 @@
       </ControlTemplate>
     </Setter>
 
+    <!--
     <Style Selector="^ /template/ primitives|ColorSlider#ColorSpectrumThirdComponentSlider[ColorComponent=Component1]">
       <Setter Property="IsPerceptive" Value="True" />
     </Style>
@@ -515,6 +516,7 @@
     <Style Selector="^ /template/ primitives|ColorSlider#Component3Slider[ColorModel=Rgba]">
       <Setter Property="IsPerceptive" Value="False" />
     </Style>
+    -->
 
   </ControlTheme>
 
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
index 97a8d4b885..d4f02933f2 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
@@ -323,7 +323,7 @@
                                         AutomationProperties.Name="Third Component"
                                         Grid.Column="0"
                                         IsAlphaVisible="False"
-                                        IsPerceptive="False"
+                                        IsPerceptive="True"
                                         Orientation="Vertical"
                                         ColorModel="Hsva"
                                         ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}"
@@ -709,6 +709,7 @@
       </ControlTemplate>
     </Setter>
 
+    <!--
     <Style Selector="^ /template/ primitives|ColorSlider#ColorSpectrumThirdComponentSlider[ColorComponent=Component1]">
       <Setter Property="IsPerceptive" Value="True" />
     </Style>
@@ -722,6 +723,7 @@
     <Style Selector="^ /template/ primitives|ColorSlider#Component3Slider[ColorModel=Rgba]">
       <Setter Property="IsPerceptive" Value="False" />
     </Style>
+    -->
 
   </ControlTheme>