Switch to the WinUI ColorSpectrum

Author: robloo

Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs

@@ -15,6 +15,7 @@
 using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Media;
 using ColorPickerSlider = Microsoft.Toolkit.Uwp.UI.Controls.Primitives.ColorPickerSlider;
+using ColorSpectrum = Microsoft.UI.Xaml.Controls.Primitives.ColorSpectrum;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -1226,7 +1227,7 @@ private void CustomPaletteColors_CollectionChanged(object sender, NotifyCollecti
         /// Event handler for when the color spectrum color is changed.
         /// This occurs when the user presses on the spectrum to select a new color.
         /// </summary>
-        private void ColorSpectrum_ColorChanged(ColorSpectrum sender, Windows.UI.Xaml.Controls.ColorChangedEventArgs args)
+        private void ColorSpectrum_ColorChanged(ColorSpectrum sender, Microsoft.UI.Xaml.Controls.ColorChangedEventArgs args)
         {
             // It is OK in this case to use the RGB representation
             this.ScheduleColorUpdate(this.ColorSpectrumControl.Color);

Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml

@@ -4,7 +4,8 @@
                     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
                     xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
                     xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
-                    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
+                    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
+                    xmlns:winuiprimitives="using:Microsoft.UI.Xaml.Controls.Primitives">
 
     <SolidColorBrush x:Key="CheckerboardColor0">
         <SolidColorBrush.Color>
@@ -120,23 +121,23 @@
                                                       Orientation="Vertical" />
                         <!--  Keep in mind the spectrum is always HSV  -->
                         <!--  This must also not be named 'ColorSpectrum' to differentiate from the base class  -->
-                        <ColorSpectrum x:Name="ColorSpectrumControl"
-                                       Grid.Row="0"
-                                       Grid.RowSpan="2"
-                                       Grid.Column="1"
-                                       MinWidth="256"
-                                       MinHeight="256"
-                                       HorizontalAlignment="Stretch"
-                                       VerticalAlignment="Stretch"
-                                       AutomationProperties.Name="Third Dimension"
-                                       Components="{TemplateBinding ColorSpectrumComponents}"
-                                       MaxHue="{TemplateBinding MaxHue}"
-                                       MaxSaturation="{TemplateBinding MaxSaturation}"
-                                       MaxValue="{TemplateBinding MaxValue}"
-                                       MinHue="{TemplateBinding MinHue}"
-                                       MinSaturation="{TemplateBinding MinSaturation}"
-                                       MinValue="{TemplateBinding MinValue}"
-                                       Shape="{TemplateBinding ColorSpectrumShape}" />
+                        <winuiprimitives:ColorSpectrum x:Name="ColorSpectrumControl"
+                                                       Grid.Row="0"
+                                                       Grid.RowSpan="2"
+                                                       Grid.Column="1"
+                                                       MinWidth="256"
+                                                       MinHeight="256"
+                                                       HorizontalAlignment="Stretch"
+                                                       VerticalAlignment="Stretch"
+                                                       AutomationProperties.Name="Third Dimension"
+                                                       Components="{TemplateBinding ColorSpectrumComponents}"
+                                                       MaxHue="{TemplateBinding MaxHue}"
+                                                       MaxSaturation="{TemplateBinding MaxSaturation}"
+                                                       MaxValue="{TemplateBinding MaxValue}"
+                                                       MinHue="{TemplateBinding MinHue}"
+                                                       MinSaturation="{TemplateBinding MinSaturation}"
+                                                       MinValue="{TemplateBinding MinValue}"
+                                                       Shape="{TemplateBinding ColorSpectrumShape}" />
                         <primitives:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
                                                       Grid.Row="1"
                                                       Grid.RowSpan="2"