Merge pull request #45 from Aelarion/main

Fix double-click maximize issue referenced by #43
lepoco · Jan 27, 2022 · d563784 · d563784
2 parents cfedcf2 + a6bd85c
commit d563784
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/WPFUI/Controls/TitleBar.cs b/WPFUI/Controls/TitleBar.cs
@@ -9,6 +9,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using WPFUI.Win32;
 
 namespace WPFUI.Controls
 {
@@ -19,6 +20,8 @@ public class TitleBar : UserControl
     {
         private Window _parent;
 
+        private User32.POINT _doubleClickPoint;
+
         private Tray.NotifyIcon _notifyIcon;
 
         private Common.SnapLayout _snapLayout;
@@ -457,7 +460,6 @@ private void TitleBar_Loaded(object sender, RoutedEventArgs e)
 
             if (rootGrid != null)
             {
-                rootGrid.MouseDown += RootGrid_MouseDown;
                 rootGrid.MouseLeftButtonDown += RootGrid_MouseLeftButtonDown;
                 rootGrid.MouseMove += RootGrid_MouseMove;
             }
@@ -470,6 +472,10 @@ private void RootGrid_MouseMove(object sender, MouseEventArgs e)
         {
             if (e.LeftButton != MouseButtonState.Pressed || ParentWindow == null) return;
 
+            // prevent firing from double clicking when the mouse never actually moved
+            User32.GetCursorPos(out var currentMousePos);
+            if (currentMousePos.X == _doubleClickPoint.X && currentMousePos.Y == _doubleClickPoint.Y) return;
+
             if (IsMaximized)
             {
                 var screenPoint = PointToScreen(e.MouseDevice.GetPosition(this));
@@ -490,9 +496,9 @@ private void RootGrid_MouseMove(object sender, MouseEventArgs e)
                 ParentWindow.WindowStyle = WindowStyle.None;
                 ParentWindow.WindowState = WindowState.Normal;
                 ParentWindow.WindowStyle = style;
-
-                ParentWindow.DragMove();
             }
+
+            ParentWindow.DragMove();
         }
 
         private void ParentWindow_StateChanged(object sender, EventArgs e)
@@ -503,18 +509,13 @@ private void ParentWindow_StateChanged(object sender, EventArgs e)
                 IsMaximized = ParentWindow.WindowState == WindowState.Maximized;
         }
 
-        private void RootGrid_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton != MouseButton.Left)
-                return;
-
-            ParentWindow.DragMove();
-        }
-
         private void RootGrid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ClickCount == 2)
+            {
+                User32.GetCursorPos(out _doubleClickPoint);
                 MaximizeWindow();
+            }
         }
 
         private void TemplateButton_OnClick(TitleBar sender, object parameter)

diff --git a/WPFUI/Win32/User32.cs b/WPFUI/Win32/User32.cs
@@ -273,6 +273,31 @@ public struct WINCOMPATTRDATA
             public int SizeOfData;
         }
 
+        /// <summary>
+        /// The POINT structure defines the x- and y-coordinates of a point.
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT
+        {
+            /// <summary>
+            /// Specifies the x-coordinate of the point.
+            /// </summary>
+            public int X;
+            /// <summary>
+            /// Specifies the y-coordinate of the point.
+            /// </summary>
+            public int Y;
+        }
+
+        /// <summary>
+        /// Retrieves the position of the mouse cursor, in screen coordinates.
+        /// </summary>
+        /// <param name="lpPoint">A <see cref="POINT"/> structure that receives the screen coordinates of the cursor.</param>
+        /// <returns></returns>
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetCursorPos(out POINT lpPoint);
+
         /// <summary>
         /// Sets various information regarding DWM window attributes.
         /// </summary>