DraggablePickerFlyoutのドラッグ操作を修正

Author: yuto-trd

src/Beutl.Controls/PropertyEditors/DraggablePickerFlyoutPresenter.cs

@@ -1,5 +1,4 @@
 using System.Reactive.Disposables;
-
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -8,9 +7,7 @@
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
-
 using Beutl.Reactive;
-
 using FluentAvalonia.Core;
 
 #nullable enable
@@ -120,7 +117,7 @@ private void OnCloseClick(object? sender, RoutedEventArgs e)
 
     private void OnDragAreaPointerExited(object? sender, PointerEventArgs e)
     {
-        _pressed = false;
+        // _pressed = false;
     }
 
     private void OnDragAreaPointerReleased(object? sender, PointerReleasedEventArgs e)
@@ -132,30 +129,32 @@ private void OnDragAreaPointerMoved(object? sender, PointerEventArgs e)
     {
         if (_dragArea == null || !_pressed) return;
 
-        PointerPoint pointer = e.GetCurrentPoint(null);
-        Point point = pointer.Position;
-        Point delta = point - _point;
-
         if (this.FindLogicalAncestorOfType<Popup>() is { } popup)
         {
+            PointerPoint pointer = e.GetCurrentPoint(null);
+            Point point = pointer.Position;
+            Point delta = point - _point;
+
             popup.HorizontalOffset += delta.X;
             popup.VerticalOffset += delta.Y;
+            if (this.FindAncestorOfType<PopupRoot>() == null)
+            {
+                _point = point;
+            }
         }
     }
 
     private void OnDragAreaPointerPressed(object? sender, PointerPressedEventArgs e)
     {
         if (_dragArea == null) return;
 
+        var root = this.FindAncestorOfType<PopupRoot>();
         PointerPoint pointer = e.GetCurrentPoint(null);
         if (pointer.Properties.IsLeftButtonPressed)
         {
             _pressed = true;
             _point = pointer.Position;
-            if (this.FindAncestorOfType<PopupRoot>() is { } root)
-            {
-                root.Activate();
-            }
+            root?.Activate();
         }
     }
 }