Fixed dragging a window out of maximized state

Macabresoft · Oct 24, 2023 · f01ba2d · f01ba2d
1 parent f1f4cf9
commit f01ba2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/AvaloniaEx/Views/Dialogs/BaseDialog.axaml b/AvaloniaEx/Views/Dialogs/BaseDialog.axaml
@@ -9,6 +9,7 @@
         CanResize="True"
         ExtendClientAreaToDecorationsHint="True"
         WindowStartupLocation="CenterOwner"
+        PositionChanged="WindowBase_OnPositionChanged"
         Background="{StaticResource SystemAltHighColor}">
     <Window.Template>
         <ControlTemplate>

diff --git a/AvaloniaEx/Views/Dialogs/BaseDialog.axaml.cs b/AvaloniaEx/Views/Dialogs/BaseDialog.axaml.cs
@@ -1,6 +1,5 @@
 namespace Macabresoft.AvaloniaEx;
 
-using System;
 using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
@@ -99,21 +98,18 @@ private void TitleBar_OnDoubleTapped(object _, TappedEventArgs e) {
     }
 
     private void TitleBar_OnPointerPressed(object _, PointerPressedEventArgs e) {
-        if (this.WindowState != WindowState.Normal && !this._isHandlingMaximize) {
+        this.BeginMoveDrag(e);
+    }
+
+    private void WindowBase_OnPositionChanged(object _, PixelPointEventArgs e) {
+        if (this.WindowState == WindowState.Maximized && !this._isHandlingMaximize) {
             try {
                 this._isHandlingMaximize = true;
-                var position = this.Position;
                 this.WindowState = WindowState.Normal;
-                this.Position = position;
-                var mousePosition = e.GetPosition(null);
-                var x = (int)Math.Floor(this.Position.X + mousePosition.X);
-                this.Position = new PixelPoint(x, position.Y);
             }
             finally {
                 this._isHandlingMaximize = false;
             }
         }
-
-        this.BeginMoveDrag(e);
     }
 }