Merge branch 'main' into dwm

Author: Arlodotexe

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/Behaviors/src/Animations/StartAnimationAction.cs

@@ -45,7 +45,7 @@ public UIElement TargetObject
     public static readonly DependencyProperty TargetObjectProperty = DependencyProperty.Register(
         nameof(TargetObject),
         typeof(UIElement),
-        typeof(StartAnimationActivity),
+        typeof(StartAnimationAction),
         new PropertyMetadata(null));
 
     /// <inheritdoc/>

…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);
         }

components/LayoutTransformControl/src/LayoutTransformControl.cs

@@ -9,9 +9,12 @@ namespace CommunityToolkit.WinUI.Controls;
 /// Control that implements support for transformations as if applied by LayoutTransform.
 /// </summary>
 [ContentProperty(Name = "Child")]
-
+[TemplatePart(Name = "LayoutRoot", Type = typeof(Panel))]
+[TemplatePart(Name = "MatrixTransform", Type = typeof(MatrixTransform))]
 public partial class LayoutTransformControl : Control
 {
+    private static Size EmptySize => new Size();
+
     /// <summary>
     /// Value used to work around double arithmetic rounding issues.
     /// </summary>
@@ -45,7 +48,7 @@ public partial class LayoutTransformControl : Control
     /// <summary>
     /// Actual DesiredSize of Child element.
     /// </summary>
-    private Size _childActualSize = Size.Empty;
+    private Size _childActualSize = EmptySize;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="LayoutTransformControl"/> class.
@@ -235,11 +238,11 @@ protected override Size MeasureOverride(Size availableSize)
         if (_layoutRoot == null || child == null)
         {
             // No content, no size
-            return Size.Empty;
+            return EmptySize;
         }
 
         Size measureSize;
-        if (_childActualSize == Size.Empty)
+        if (_childActualSize == EmptySize)
         {
             // Determine the largest size after the transformation
             measureSize = ComputeLargestTransformedSize(availableSize);
@@ -301,7 +304,7 @@ protected override Size ArrangeOverride(Size finalSize)
         _layoutRoot.Arrange(finalRect);
 
         // This is the first opportunity to find out the Child's true DesiredSize
-        if (IsSizeSmaller(finalSizeTransformed, child.RenderSize) && (Size.Empty == _childActualSize))
+        if (IsSizeSmaller(finalSizeTransformed, child.RenderSize) && (EmptySize == _childActualSize))
         {
             // Unfortunately, all the work so far is invalid because the wrong DesiredSize was used
             // Make a note of the actual DesiredSize
@@ -313,7 +316,7 @@ protected override Size ArrangeOverride(Size finalSize)
         else
         {
             // Clear the "need to measure/arrange again" flag
-            _childActualSize = Size.Empty;
+            _childActualSize = EmptySize;
         }
 
         // Return result to perform the transformation
@@ -329,7 +332,7 @@ protected override Size ArrangeOverride(Size finalSize)
     private Size ComputeLargestTransformedSize(Size arrangeBounds)
     {
         // Computed largest transformed size
-        Size computedSize = Size.Empty;
+        Size computedSize = EmptySize;
 
         // Detect infinite bounds and constrain the scenario
         bool infiniteWidth = double.IsInfinity(arrangeBounds.Width);

components/LayoutTransformControl/src/PropertyChangeEventSource.cs

@@ -8,87 +8,47 @@ namespace CommunityToolkit.WinUI.Controls;
 /// Allows raise an event when the value of a dependency property changes when a view model is otherwise not necessary.
 /// </summary>
 /// <typeparam name="TPropertyType">Type of the DependencyProperty</typeparam>
-internal partial class PropertyChangeEventSource<TPropertyType> : FrameworkElement
+internal partial class PropertyChangeEventSource<TPropertyType>
 {
     private readonly DependencyObject _source;
+    private readonly DependencyProperty _property;
+    private readonly long _token;
 
     /// <summary>
     /// Occurs when the value changes.
     /// </summary>
     public event EventHandler<TPropertyType> ValueChanged;
 
     /// <summary>
-    /// Value Dependency Property
-    /// </summary>
-    public static readonly DependencyProperty ValueProperty =
-        DependencyProperty.Register(
-            "Value",
-            typeof(TPropertyType),
-            typeof(PropertyChangeEventSource<TPropertyType>),
-            new PropertyMetadata(default(TPropertyType), OnValueChanged));
-
-    /// <summary>
-    /// Gets or sets the Value property. This dependency property
-    /// indicates the value.
+    /// Gets the Value property.
     /// </summary>
     public TPropertyType Value
     {
-        get { return (TPropertyType)GetValue(ValueProperty); }
-        set { SetValue(ValueProperty, value); }
-    }
-
-    /// <summary>
-    /// Handles changes to the Value property.
-    /// </summary>
-    /// <param name="d">
-    /// The <see cref="DependencyObject"/> on which the property has changed value.
-    /// </param>
-    /// <param name="e">
-    /// Event data that is issued by any event that
-    /// tracks changes to the effective value of this property.
-    /// </param>
-    private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        var target = (PropertyChangeEventSource<TPropertyType>)d;
-        TPropertyType oldValue = (TPropertyType)e.OldValue;
-        TPropertyType newValue = target.Value;
-        target.OnValueChanged(oldValue, newValue);
-    }
-
-    /// <summary>
-    /// Provides derived classes an opportunity to handle changes to the Value property.
-    /// </summary>
-    /// <param name="oldValue">The old Value value</param>
-    /// <param name="newValue">The new Value value</param>
-    private void OnValueChanged(TPropertyType oldValue, TPropertyType newValue)
-    {
-        ValueChanged?.Invoke(_source, newValue);
+        get => (TPropertyType)_source.GetValue(_property);
+        set => _source.SetValue(_property, value);
     }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="PropertyChangeEventSource{TPropertyType}"/> class.
     /// </summary>
     /// <param name="source">The source.</param>
-    /// <param name="propertyName">Name of the property.</param>
-    /// <param name="bindingMode">The binding mode.</param>
+    /// <param name="property">Monitor this dependency property for changes.</param>
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public PropertyChangeEventSource(
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         DependencyObject source,
-        string propertyName,
-        BindingMode bindingMode = BindingMode.TwoWay)
+        DependencyProperty property)
     {
         _source = source;
+        _property = property;
+        _token = source.RegisterPropertyChangedCallback(property, (_, _) =>
+        {
+            ValueChanged?.Invoke(this, (TPropertyType)source.GetValue(property));
+        });
+    }
 
-        // Bind to the property to be able to get its changes relayed as events through the ValueChanged event.
-        var binding =
-            new Binding
-            {
-                Source = source,
-                Path = new PropertyPath(propertyName),
-                Mode = bindingMode
-            };
-
-        SetBinding(ValueProperty, binding);
+    public void Unregister()
+    {
+        _source.UnregisterPropertyChangedCallback(_property, _token);
     }
 }

components/Primitives/src/WrapPanel/WrapPanel.cs

@@ -214,7 +214,7 @@ void Arrange(UIElement child, bool isLast = false)
             }
 
             var desiredMeasure = new UvMeasure(Orientation, child.DesiredSize);
-            if ((desiredMeasure.U + position.U + paddingEnd.U) > parentMeasure.U)
+            if ((desiredMeasure.U + position.U + paddingEnd.U) > parentMeasure.U || position.U >= parentMeasure.U)
             {
                 // next row!
                 position.U = paddingStart.U;