Derive from the WinUI ColorPicker

Author: robloo

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

@@ -53,7 +53,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1501:Statement should not be on a single line", Justification = "Inline brackets are used to improve code readability with repeated null checks.")]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1025:Code should not contain multiple whitespace in a row", Justification = "Whitespace is used to align code in columns for readability.")]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1306:Field names should begin with lower-case letter", Justification = "Only template parts start with a capital letter. This differentiates them from other fields.")]
-    public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
+    public partial class ColorPicker : Microsoft.UI.Xaml.Controls.ColorPicker
     {
         internal Color CheckerBackgroundColor { get; set; } = Color.FromArgb(0x19, 0x80, 0x80, 0x80); // Overridden later
 
@@ -123,6 +123,7 @@ public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
         public ColorPicker()
         {
             this.DefaultStyleKey = typeof(ColorPicker);
+            this.DefaultStyleResourceUri = new System.Uri("ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml");
 
             // Setup collections
             this.SetValue(CustomPaletteColorsProperty, new ObservableCollection<Color>());
@@ -487,22 +488,22 @@ private ColorChannel GetActiveColorSpectrumThirdDimension()
         {
             switch (this.ColorSpectrumComponents)
             {
-                case Windows.UI.Xaml.Controls.ColorSpectrumComponents.SaturationValue:
-                case Windows.UI.Xaml.Controls.ColorSpectrumComponents.ValueSaturation:
+                case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.SaturationValue:
+                case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.ValueSaturation:
                     {
                         // Hue
                         return ColorChannel.Channel1;
                     }
 
-                case Windows.UI.Xaml.Controls.ColorSpectrumComponents.HueValue:
-                case Windows.UI.Xaml.Controls.ColorSpectrumComponents.ValueHue:
+                case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.HueValue:
+                case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.ValueHue:
                     {
                         // Saturation
                         return ColorChannel.Channel2;
                     }
 
-                case Windows.UI.Xaml.Controls.ColorSpectrumComponents.HueSaturation:
-                case Windows.UI.Xaml.Controls.ColorSpectrumComponents.SaturationHue:
+                case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.HueSaturation:
+                case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.SaturationHue:
                     {
                         // Value
                         return ColorChannel.Channel3;
@@ -1126,7 +1127,7 @@ private void DispatcherQueueTimer_Tick(object sender, object e)
          ***************************************************************************************/
 
         /// <summary>
-        /// Callback for when the <see cref="Windows.UI.Xaml.Controls.ColorPicker.Color"/> dependency property value changes.
+        /// Callback for when the <see cref="Microsoft.UI.Xaml.Controls.ColorPicker.Color"/> dependency property value changes.
         /// </summary>
         private void OnColorChanged(DependencyObject d, DependencyProperty e)
         {

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

@@ -142,7 +142,7 @@ protected override void OnApplyTemplate()
             }
         }
 
-        private void ColorPicker_ColorChanged(Windows.UI.Xaml.Controls.ColorPicker sender, ColorChangedEventArgs args)
+        private void ColorPicker_ColorChanged(Microsoft.UI.Xaml.Controls.ColorPicker sender, Microsoft.UI.Xaml.Controls.ColorChangedEventArgs args)
         {
             SelectedColor = args.NewColor;
         }