Browse Source

Always enable ColorSlider.IsPerceptive

This works-around #11271 and stabilizes the API. It can be revisited later.
pull/11264/head
robloo 3 years ago
parent
commit
8fed1f30f0
  1. 4
      src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
  2. 4
      src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
  3. 4
      src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml
  4. 4
      src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml

4
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>

4
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>

4
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>

4
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>

Loading…
Cancel
Save