Merge branch 'main' into fix-color-picker-button-binding-issue

Author: michael-hawker

.github/fabricbot.json

@@ -11,7 +11,8 @@
         <controls:ListDetailsView BackButtonBehavior="Automatic"
                                     ItemsSource="{Binding Emails}"
                                     NoSelectionContent="Select an item to view"
-                                    CompactModeThresholdWidth="720">
+                                    CompactModeThresholdWidth="720"
+                                    ListPaneWidth="400">
             <controls:ListDetailsView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Margin="0,8">

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind

@@ -29,7 +29,7 @@ public AnimationSet Animation
         public static readonly DependencyProperty AnimationProperty = DependencyProperty.Register(
             nameof(Animation),
             typeof(AnimationSet),
-            typeof(StartAnimationActivity),
+            typeof(StopAnimationActivity),
             new PropertyMetadata(null));
 
         /// <summary>
@@ -47,7 +47,7 @@ public UIElement TargetObject
         public static readonly DependencyProperty TargetObjectProperty = DependencyProperty.Register(
             nameof(TargetObject),
             typeof(UIElement),
-            typeof(StartAnimationActivity),
+            typeof(StopAnimationActivity),
             new PropertyMetadata(null));
 
         /// <inheritdoc/>

Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Activities/StopAnimationActivity.cs

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

Microsoft.Toolkit.Uwp.UI.Behaviors/Animations/StartAnimationAction.cs

@@ -46,10 +46,10 @@ protected override bool Uninitialize()
         }
 
         /// <summary>
-        /// The UIElement that will be faded.
+        /// The UIElement that will be sticky.
         /// </summary>
         public static readonly DependencyProperty HeaderElementProperty = DependencyProperty.Register(
-            nameof(HeaderElement), typeof(UIElement), typeof(QuickReturnHeaderBehavior), new PropertyMetadata(null, PropertyChangedCallback));
+            nameof(HeaderElement), typeof(UIElement), typeof(StickyHeaderBehavior), new PropertyMetadata(null, PropertyChangedCallback));
 
         private ScrollViewer _scrollViewer;
         private double _previousVerticalScrollOffset;

Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/StickyHeaderBehavior.cs

@@ -193,34 +193,10 @@ private void ThemeListener_ThemeChanged(ThemeListener sender)
             OnColorsChanged();
         }
 
-        private void RadialGauge_KeyDown(object sender, KeyRoutedEventArgs e)
-        {
-            double step = SmallChange;
-            var ctrl = Window.Current.CoreWindow.GetKeyState(VirtualKey.Control);
-            if (ctrl.HasFlag(CoreVirtualKeyStates.Down))
-            {
-                step = LargeChange;
-            }
-
-            step = Math.Max(StepSize, step);
-            if ((e.Key == VirtualKey.Left) || (e.Key == VirtualKey.Down))
-            {
-                Value = Math.Max(Minimum, Value - step);
-                e.Handled = true;
-                return;
-            }
-
-            if ((e.Key == VirtualKey.Right) || (e.Key == VirtualKey.Up))
-            {
-                Value = Math.Min(Maximum, Value + step);
-                e.Handled = true;
-            }
-        }
-
         private void RadialGauge_Unloaded(object sender, RoutedEventArgs e)
         {
             // Unregister event handlers.
-            KeyDown -= RadialGauge_KeyDown;
+            KeyboardAccelerators.Clear();
             ThemeListener.ThemeChanged -= ThemeListener_ThemeChanged;
             PointerReleased -= RadialGauge_PointerReleased;
             Unloaded -= RadialGauge_Unloaded;
@@ -439,10 +415,58 @@ protected override void OnApplyTemplate()
             _tickBrush = ReadLocalValue(TickBrushProperty) as SolidColorBrush;
             _foreground = ReadLocalValue(ForegroundProperty) as SolidColorBrush;
 
-            // Register event handlers.
+            // Small step
+            AddKeyboardAccelerator(VirtualKeyModifiers.None, VirtualKey.Left, (_, kaea) =>
+            {
+                Value = Math.Max(Minimum, Value - Math.Max(StepSize, SmallChange));
+                kaea.Handled = true;
+            });
+
+            AddKeyboardAccelerator(VirtualKeyModifiers.None, VirtualKey.Up, (_, kaea) =>
+            {
+                Value = Math.Min(Maximum, Value + Math.Max(StepSize, SmallChange));
+                kaea.Handled = true;
+            });
+
+            AddKeyboardAccelerator(VirtualKeyModifiers.None, VirtualKey.Right, (_, kaea) =>
+            {
+                Value = Math.Min(Maximum, Value + Math.Max(StepSize, SmallChange));
+                kaea.Handled = true;
+            });
+
+            AddKeyboardAccelerator(VirtualKeyModifiers.None, VirtualKey.Down, (_, kaea) =>
+            {
+                Value = Math.Max(Minimum, Value - Math.Max(StepSize, SmallChange));
+                kaea.Handled = true;
+            });
+
+            // Large step
+            AddKeyboardAccelerator(VirtualKeyModifiers.Control, VirtualKey.Left, (_, kaea) =>
+            {
+                Value = Math.Max(Minimum, Value - Math.Max(StepSize, LargeChange));
+                kaea.Handled = true;
+            });
+
+            AddKeyboardAccelerator(VirtualKeyModifiers.Control, VirtualKey.Up, (_, kaea) =>
+            {
+                Value = Math.Min(Maximum, Value + Math.Max(StepSize, LargeChange));
+                kaea.Handled = true;
+            });
+
+            AddKeyboardAccelerator(VirtualKeyModifiers.Control, VirtualKey.Right, (_, kaea) =>
+            {
+                Value = Math.Min(Maximum, Value + Math.Max(StepSize, LargeChange));
+                kaea.Handled = true;
+            });
+
+            AddKeyboardAccelerator(VirtualKeyModifiers.Control, VirtualKey.Down, (_, kaea) =>
+            {
+                Value = Math.Max(Minimum, Value - Math.Max(StepSize, LargeChange));
+                kaea.Handled = true;
+            });
+
             PointerReleased += RadialGauge_PointerReleased;
             ThemeListener.ThemeChanged += ThemeListener_ThemeChanged;
-            KeyDown += RadialGauge_KeyDown;
 
             // Apply color scheme.
             OnColorsChanged();
@@ -830,5 +854,19 @@ private double RoundToMultiple(double number, double multiple)
 
             return number + modulo;
         }
+
+        private void AddKeyboardAccelerator(
+            VirtualKeyModifiers keyModifiers,
+            VirtualKey key,
+            TypedEventHandler<KeyboardAccelerator, KeyboardAcceleratorInvokedEventArgs> handler)
+        {
+            var accelerator = new KeyboardAccelerator()
+            {
+                Modifiers = keyModifiers,
+                Key = key
+            };
+            accelerator.Invoked += handler;
+            KeyboardAccelerators.Add(accelerator);
+        }
     }
 }

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

@@ -461,7 +461,10 @@ protected override void OnItemsChanged(object e)
         /// </summary>
         private void OnListPaneWidthChanged()
         {
-            _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);
+            if (_twoPaneView != null)
+            {
+                _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);
+            }
         }
     }
 }

Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs

@@ -106,7 +106,11 @@ private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)
                 _currentCroppedRect = croppedRect;
             }
 
-            UpdateImageLayout(true);
+            if (TryUpdateImageLayout(true))
+            {
+                UpdateSelectionThumbs(true);
+                UpdateMaskArea(true);
+            }
         }
 
         private void ImageCropperThumb_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
@@ -119,7 +123,11 @@ private void ImageCropperThumb_ManipulationCompleted(object sender, Manipulation
                 _currentCroppedRect = croppedRect;
             }
 
-            UpdateImageLayout(true);
+            if (TryUpdateImageLayout(true))
+            {
+                UpdateSelectionThumbs(true);
+                UpdateMaskArea(true);
+            }
         }
 
         private void ImageCropperThumb_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
@@ -161,7 +169,12 @@ private void SourceImage_ManipulationDelta(object sender, ManipulationDeltaRoute
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
             croppedRect.Intersect(_restrictedCropRect);
             _currentCroppedRect = croppedRect;
-            UpdateImageLayout();
+
+            if (TryUpdateImageLayout())
+            {
+                UpdateSelectionThumbs();
+                UpdateMaskArea();
+            }
         }
 
         private void ImageCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
@@ -171,8 +184,16 @@ private void ImageCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
                 return;
             }
 
-            UpdateImageLayout();
-            UpdateMaskArea();
+            if (TryUpdateImageLayout())
+            {
+                UpdateSelectionThumbs();
+            }
+
+            if (TryUpdateAspectRatio())
+            {
+                UpdateSelectionThumbs();
+                UpdateMaskArea();
+            }
         }
     }
 }