Merge pull request #9266 from robloo/colorpicker-updates-4

Rework ColorPicker ControlTheme
AvaloniaUI · Oct 29, 2022 · 3b8782c · 3b8782c
2 parents 7278dce + 9380008
commit 3b8782c
Show file tree

Hide file tree

Showing 6 changed files with 927 additions and 95 deletions.
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
@@ -24,18 +24,19 @@
                  HsvColor="hsv(120, 1, 1)"
                  Margin="0,50,0,0">
       <ColorPicker.Palette>
-        <controls:FlatColorPalette />
+        <controls:FlatHalfColorPalette />
       </ColorPicker.Palette>
     </ColorPicker>
     <Grid Grid.Column="2"
           Grid.Row="0"
-          RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+          RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
       <ColorSpectrum x:Name="ColorSpectrum1"
                      Grid.Row="0"
                      Color="Red"
                      CornerRadius="10"
                      Height="256"
                      Width="256" />
+      <!-- HSV Sliders -->
       <ColorSlider Grid.Row="1"
                    Margin="0,10,0,0"
                    ColorComponent="Component1"
@@ -53,7 +54,21 @@
                    ColorComponent="Alpha"
                    ColorModel="Hsva"
                    HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
-      <ColorPreviewer Grid.Row="5"
+      <!-- RGB Sliders -->
+      <!--<ColorSlider Grid.Row="5"
+                   Margin="0,10,0,0"
+                   ColorComponent="Component1"
+                   ColorModel="Rgba"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="6"
+                   ColorComponent="Component2"
+                   ColorModel="Rgba"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
+      <ColorSlider Grid.Row="7"
+                   ColorComponent="Component3"
+                   ColorModel="Rgba"
+                   HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />-->
+      <ColorPreviewer Grid.Row="8"
                       IsAccentColorsVisible="False"
                       HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
     </Grid>

diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
@@ -20,6 +20,7 @@ public ColorPickerPage()
                 Color = Colors.Blue,
                 Margin = new Thickness(0, 50, 0, 0),
                 HorizontalAlignment = HorizontalAlignment.Center,
+                Palette = new MaterialHalfColorPalette(),
             };
             Grid.SetColumn(colorPicker, 2);
             Grid.SetRow(colorPicker, 1);

diff --git a/src/Avalonia.Controls.ColorPicker/ColorPicker/ColorPicker.cs b/src/Avalonia.Controls.ColorPicker/ColorPicker/ColorPicker.cs
@@ -14,33 +14,5 @@ public class ColorPicker : ColorView
         public ColorPicker() : base()
         {
         }
-
-        /// <inheritdoc/>
-        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-        {
-            base.OnApplyTemplate(e);
-
-            // Until this point the ColorPicker itself is responsible to process property updates.
-            // This, for example, syncs Color with HsvColor and updates primitive controls.
-            //
-            // However, when the template is created, hand-off this change processing to the
-            // ColorView within the control template itself. Remember ColorPicker derives from
-            // ColorView so we don't want two instances of the same logic fighting each other.
-            // It is best to hand-off to the ColorView in the control template because that is the
-            // primary point of user-interaction for the overall control. It also simplifies binding.
-            //
-            // Keep in mind this hand-off is not possible until the template controls are created
-            // which is done after the ColorPicker is instantiated. The ColorPicker must still
-            // process updates before the template is applied to ensure all property changes in
-            // XAML or object initializers are handled correctly. Otherwise, there can be bugs
-            // such as setting the Color property doesn't work because the HsvColor is never updated
-            // and then the Color value is lost once the template loads (and the template ColorView
-            // takes over).
-            //
-            // In order to complete this hand-off, completely ignore property changes here in the
-            // ColorPicker. This means the ColorView in the control template is now responsible to
-            // process property changes and handle primary calculations.
-            base.ignorePropertyChanged = true;
-        }
     }
 }
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
@@ -240,7 +240,7 @@ public ColorSpectrumShape Shape
         public ColorComponent ThirdComponent
         {
             get => GetValue(ThirdComponentProperty);
-            private set => SetValue(ThirdComponentProperty, value);
+            protected set => SetValue(ThirdComponentProperty, value);
         }
     }
 }