Merge branch 'Color-Helper' of https://github.com/Avid29/CommunityToolkit-Windows into Color-Helper

Author: Avid29

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "uno.check": {
-      "version": "1.27.4",
+      "version": "1.33.1",
       "commands": [
         "uno-check"
       ]

.github/workflows/build.yml

@@ -121,6 +121,7 @@ jobs:
           --skip wsl
           --skip androidemulator
           --skip vswinworkloads
+          --skip vswin
           --verbose
 
       - name: Add msbuild to PATH
@@ -254,6 +255,7 @@ jobs:
           --skip wsl
           --skip androidemulator
           --skip vswinworkloads
+          --skip vswin
           --verbose
 
       - name: Add msbuild to PATH

ReadMe.md

@@ -21,7 +21,7 @@ Please read the [Getting Started with the Windows Community Toolkit](https://doc
 > [!NOTE]
 > If you're updating from a pre-8.x version of the Windows Community Toolkit, see [our migration notes here](https://aka.ms/toolkit/windows/migration).
 
-## Windows Community Toolkit Gallery app
+## <sub><img src="icon.png" width="24" height="24" hspace="4"></sub> Windows Community Toolkit Gallery app
 
 Want to see the Toolkit in action before jumping into the code? Download and play with the [Windows Community Toolkit Gallery](https://aka.ms/windowstoolkitapp) from the Microsoft Store.
 

components/ColorPicker/src/ColorPicker.cs

@@ -46,6 +46,7 @@ namespace CommunityToolkit.WinUI.Controls;
 [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumControl),        Type = typeof(ColorSpectrum))]
 [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumAlphaSlider),    Type = typeof(ColorPickerSlider))]
 [TemplatePart(Name = nameof(ColorPicker.ColorSpectrumThirdDimensionSlider), Type = typeof(ColorPickerSlider))]
+[TemplatePart(Name = nameof(ColorPicker.PaletteItemGridView),         Type = typeof(GridView))]
 [TemplatePart(Name = nameof(ColorPicker.HexInputTextBox),             Type = typeof(TextBox))]
 [TemplatePart(Name = nameof(ColorPicker.ColorModeComboBox), Type = typeof(ComboBox))]
 
@@ -81,6 +82,7 @@ public partial class ColorPicker : Microsoft.UI.Xaml.Controls.ColorPicker
     private ColorSpectrum     ColorSpectrumControl;
     private ColorPickerSlider ColorSpectrumAlphaSlider;
     private ColorPickerSlider ColorSpectrumThirdDimensionSlider;
+    private GridView          PaletteItemGridView;
     private TextBox           HexInputTextBox;
     private ComboBox          ColorModeComboBox;
 
@@ -186,6 +188,8 @@ protected override void OnApplyTemplate()
         this.ColorSpectrumAlphaSlider          = (ColorPickerSlider)this.GetTemplateChild(nameof(ColorSpectrumAlphaSlider));
         this.ColorSpectrumThirdDimensionSlider = (ColorPickerSlider)this.GetTemplateChild(nameof(ColorSpectrumThirdDimensionSlider));
 
+        this.PaletteItemGridView = (GridView)GetTemplateChild(nameof(PaletteItemGridView));
+
         this.HexInputTextBox = (TextBox)this.GetTemplateChild(nameof(HexInputTextBox));
         this.ColorModeComboBox = (ComboBox)this.GetTemplateChild(nameof(ColorModeComboBox));
 
@@ -263,6 +267,9 @@ private void ConnectEvents(bool connected)
 
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged += ColorSpectrum_ColorChanged; }
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.GotFocus     += ColorSpectrum_GotFocus; }
+
+            if (this.PaletteItemGridView != null) { this.PaletteItemGridView.SelectionChanged += this.PaletteItemGridView_SelectionChanged; }
+
             if (this.HexInputTextBox      != null) { this.HexInputTextBox.KeyDown           += HexInputTextBox_KeyDown; }
             if (this.HexInputTextBox      != null) { this.HexInputTextBox.LostFocus         += HexInputTextBox_LostFocus; }
             if (this.ColorModeComboBox    != null) { this.ColorModeComboBox.SelectionChanged += ColorModeComboBox_SelectionChanged; }
@@ -309,6 +316,9 @@ private void ConnectEvents(bool connected)
 
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.ColorChanged -= ColorSpectrum_ColorChanged; }
             if (this.ColorSpectrumControl != null) { this.ColorSpectrumControl.GotFocus     -= ColorSpectrum_GotFocus; }
+
+            if (this.PaletteItemGridView != null) { this.PaletteItemGridView.SelectionChanged -= this.PaletteItemGridView_SelectionChanged; }
+
             if (this.HexInputTextBox      != null) { this.HexInputTextBox.KeyDown           -= HexInputTextBox_KeyDown; }
             if (this.HexInputTextBox      != null) { this.HexInputTextBox.LostFocus         -= HexInputTextBox_LostFocus; }
             if (this.ColorModeComboBox != null) { this.ColorModeComboBox.SelectionChanged -= ColorModeComboBox_SelectionChanged; }
@@ -1316,6 +1326,20 @@ private void ColorSpectrum_GotFocus(object sender, RoutedEventArgs e)
         return;
     }
 
+    /// <summary>
+    /// Event handler for when a color is selected from the palette.
+    /// This will update the current color.
+    /// </summary>
+    private void PaletteItemGridView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if ((sender as GridView)?.SelectedValue is not Color selectedColor)
+        {
+            return;
+        }
+
+        this.Color = selectedColor;
+    }
+
     /// <summary>
     /// Event handler for when the selected color representation changes.
     /// This will convert between RGB and HSV.

components/ColorPicker/src/ColorPicker.xaml

@@ -286,12 +286,12 @@
                                 </controls:Case>
                                 <controls:Case Value="PaletteItem">
                                     <Grid HorizontalAlignment="Stretch">
-                                        <GridView Margin="0"
+                                        <GridView x:Name="PaletteItemGridView"
+                                                  Margin="0"
                                                   Padding="0"
                                                   animations:Implicit.HideAnimations="{StaticResource HideTransitions}"
                                                   animations:Implicit.ShowAnimations="{StaticResource ShowTransitions}"
                                                   ItemsSource="{TemplateBinding CustomPaletteColors}"
-                                                  SelectedValue="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Converter={StaticResource NullToTransparentConverter}, Mode=TwoWay}"
                                                   SelectionMode="Single"
                                                   Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
                                             <GridView.ItemsPanel>

…s/Dispatcher/KeyboardDebounceSample.xaml …erExtensions/KeyboardDebounceSample.xamlcomponents/Extensions/samples/Dispatcher/KeyboardDebounceSample.xaml renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/KeyboardDebounceSample.xaml components/Extensions/samples/Dispatcher/KeyboardDebounceSample.xaml renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/KeyboardDebounceSample.xaml

@@ -1,4 +1,4 @@
-<Page x:Class="ExtensionsExperiment.Samples.DispatcherQueueExtensions.KeyboardDebounceSample"
+<Page x:Class="ExtensionsExperiment.Samples.DispatcherQueueTimerExtensions.KeyboardDebounceSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

…ispatcher/KeyboardDebounceSample.xaml.cs …xtensions/KeyboardDebounceSample.xaml.cscomponents/Extensions/samples/Dispatcher/KeyboardDebounceSample.xaml.cs renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/KeyboardDebounceSample.xaml.cs components/Extensions/samples/Dispatcher/KeyboardDebounceSample.xaml.cs renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/KeyboardDebounceSample.xaml.cs

@@ -11,7 +11,7 @@
 using DispatcherQueueTimer = Windows.System.DispatcherQueueTimer;
 #endif
 
-namespace ExtensionsExperiment.Samples.DispatcherQueueExtensions;
+namespace ExtensionsExperiment.Samples.DispatcherQueueTimerExtensions;
 
 [ToolkitSample(id: nameof(KeyboardDebounceSample), "DispatcherQueueTimer Debounce Keyboard", description: "A sample for showing how to use the DispatcherQueueTimer Debounce extension to smooth keyboard input.")]
 [ToolkitSampleNumericOption("Interval", 120, 60, 240)]

…ples/Dispatcher/MouseDebounceSample.xaml …TimerExtensions/MouseDebounceSample.xamlcomponents/Extensions/samples/Dispatcher/MouseDebounceSample.xaml renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/MouseDebounceSample.xaml components/Extensions/samples/Dispatcher/MouseDebounceSample.xaml renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/MouseDebounceSample.xaml

@@ -1,4 +1,4 @@
-<Page x:Class="ExtensionsExperiment.Samples.DispatcherQueueExtensions.MouseDebounceSample"
+<Page x:Class="ExtensionsExperiment.Samples.DispatcherQueueTimerExtensions.MouseDebounceSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

…s/Dispatcher/MouseDebounceSample.xaml.cs …erExtensions/MouseDebounceSample.xaml.cscomponents/Extensions/samples/Dispatcher/MouseDebounceSample.xaml.cs renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/MouseDebounceSample.xaml.cs components/Extensions/samples/Dispatcher/MouseDebounceSample.xaml.cs renamed to components/Extensions/samples/DispatcherQueueTimerExtensions/MouseDebounceSample.xaml.cs

@@ -11,7 +11,7 @@
 using DispatcherQueueTimer = Windows.System.DispatcherQueueTimer;
 #endif
 
-namespace ExtensionsExperiment.Samples.DispatcherQueueExtensions;
+namespace ExtensionsExperiment.Samples.DispatcherQueueTimerExtensions;
 
 [ToolkitSample(id: nameof(MouseDebounceSample), "DispatcherQueueTimer Debounce Mouse", description: "A sample for showing how to use the DispatcherQueueTimer Debounce extension to smooth mouse input.")]
 [ToolkitSampleNumericOption("Interval", 400, 300, 1000)]

components/LayoutTransformControl/src/LayoutTransformControl.Properties.cs

@@ -127,6 +127,7 @@ private void UnsubscribeFromTransformPropertyChanges(Transform transform)
         foreach (var propertyChangeEventSource in propertyChangeEventSources)
         {
             propertyChangeEventSource.ValueChanged -= OnTransformPropertyChanged;
+            propertyChangeEventSource.Unregister();
         }
 
         _transformPropertyChangeEventSources.Remove(transform);
@@ -153,7 +154,7 @@ private void SubscribeToTransformPropertyChanges(Transform transform)
 
         if (rotateTransform != null)
         {
-            var anglePropertyChangeEventSource = new PropertyChangeEventSource<double>(rotateTransform, "Angle");
+            var anglePropertyChangeEventSource = new PropertyChangeEventSource<double>(rotateTransform, RotateTransform.AngleProperty);
             anglePropertyChangeEventSource.ValueChanged += OnTransformPropertyChanged;
             propertyChangeEventSources.Add(anglePropertyChangeEventSource);
             return;
@@ -163,11 +164,11 @@ private void SubscribeToTransformPropertyChanges(Transform transform)
 
         if (scaleTransform != null)
         {
-            var scaleXPropertyChangeEventSource =  new PropertyChangeEventSource<double>(scaleTransform, "ScaleX");
+            var scaleXPropertyChangeEventSource = new PropertyChangeEventSource<double>(scaleTransform, ScaleTransform.ScaleXProperty);
             scaleXPropertyChangeEventSource.ValueChanged += OnTransformPropertyChanged;
             propertyChangeEventSources.Add(scaleXPropertyChangeEventSource);
 
-            var scaleYPropertyChangeEventSource = new PropertyChangeEventSource<double>(scaleTransform, "ScaleY");
+            var scaleYPropertyChangeEventSource = new PropertyChangeEventSource<double>(scaleTransform, ScaleTransform.ScaleYProperty);
             scaleYPropertyChangeEventSource.ValueChanged += OnTransformPropertyChanged;
             propertyChangeEventSources.Add(scaleYPropertyChangeEventSource);
             return;
@@ -177,11 +178,11 @@ private void SubscribeToTransformPropertyChanges(Transform transform)
 
         if (skewTransform != null)
         {
-            var angleXPropertyChangeEventSource =  new PropertyChangeEventSource<double>(skewTransform, "AngleX");
+            var angleXPropertyChangeEventSource = new PropertyChangeEventSource<double>(skewTransform, SkewTransform.AngleXProperty);
             angleXPropertyChangeEventSource.ValueChanged += OnTransformPropertyChanged;
             propertyChangeEventSources.Add(angleXPropertyChangeEventSource);
 
-            var angleYPropertyChangeEventSource = new PropertyChangeEventSource<double>(skewTransform, "AngleY");
+            var angleYPropertyChangeEventSource = new PropertyChangeEventSource<double>(skewTransform, SkewTransform.AngleYProperty);
             angleYPropertyChangeEventSource.ValueChanged += OnTransformPropertyChanged;
             propertyChangeEventSources.Add(angleYPropertyChangeEventSource);
             return;
@@ -194,7 +195,7 @@ private void SubscribeToTransformPropertyChanges(Transform transform)
             var matrixPropertyChangeEventSource =
                 new PropertyChangeEventSource<double>(
                     matrixTransform,
-                    "Matrix");
+                    MatrixTransform.MatrixProperty);
             matrixPropertyChangeEventSource.ValueChanged += OnTransformPropertyChanged;
             propertyChangeEventSources.Add(matrixPropertyChangeEventSource);
         }