Merge branch 'main' into PanZoomRewrite

Author: riyasy

Src/FlyPhotos/Display/Controllers/ThumbNailController.cs

@@ -149,6 +149,9 @@ public void RedrawThumbNailsIfNeeded(int updatedKey)
 
     private void D2dCanvasThumbNail_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
     {
+        if (e.GetCurrentPoint(_d2dCanvasThumbNail).Properties.PointerUpdateKind
+            is not Microsoft.UI.Input.PointerUpdateKind.LeftButtonPressed) return;
+
         var keys = _getSortedPhotoKeys?.Invoke();
         if (keys == null || keys.Count <= 1) return;
 

Src/FlyPhotos/UI/Behaviors/CtrlDragWindowMover.cs

@@ -60,7 +60,7 @@ private void OnPointerPressed(object sender, PointerRoutedEventArgs e)
     {
         if (!Util.IsControlPressed()) return;
         var point = e.GetCurrentPoint(_canvas);
-        if (!point.Properties.IsLeftButtonPressed) return;
+        if (point.Properties.PointerUpdateKind != Microsoft.UI.Input.PointerUpdateKind.LeftButtonPressed) return;
         // The `{ State: Restored }` member read roots the OverlappedPresenter projection so this cast
         // resolves under NativeAOT + Release; a memberless `is/as OverlappedPresenter` can silently
         // return null there (Debug/non-AOT are fine). Refs: CsWinRT#1930, microsoft-ui-xaml#10471.

Src/FlyPhotos/UI/Views/PhotoDisplayWindow.xaml.cs

@@ -505,7 +505,7 @@ private void D2dCanvas_PointerPressed(object sender, PointerRoutedEventArgs e)
             return;
         }
 
-        if (updateKind == Microsoft.UI.Input.PointerUpdateKind.LeftButtonPressed || pointerPoint.Properties.IsLeftButtonPressed)
+        if (updateKind == Microsoft.UI.Input.PointerUpdateKind.LeftButtonPressed)
         {
             if (!_canvasController.IsPressedOnImage(dpiAdjustedPos)) return;
             if (_ctrlDragWindowMover.Enabled && Util.IsControlPressed()) return;
@@ -519,7 +519,9 @@ private void D2dCanvas_PointerPressed(object sender, PointerRoutedEventArgs e)
     private void D2dCanvas_PointerMoved(object sender, PointerRoutedEventArgs e)
     {
         if (!_isDragging) return;
-        var currentPoint = e.GetCurrentPoint(D2dCanvas).Position;
+        var pp = e.GetCurrentPoint(D2dCanvas);
+        if (!pp.Properties.IsLeftButtonPressed) { _isDragging = false; return; }
+        var currentPoint = pp.Position;
         // Calculate logical delta
         double deltaX = currentPoint.X - _lastPoint.X;
         double deltaY = currentPoint.Y - _lastPoint.Y;