From 2b4e95e64a235bd79af1a1b34c4e062624dadb93 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Mon, 2 Jun 2025 14:55:46 +0900
Subject: [PATCH 1/7] Block window maximize and prevent resizing in WndProc

---
 Flow.Launcher.Infrastructure/Win32Helper.cs |  7 +++++++
 Flow.Launcher/MainWindow.xaml.cs            | 21 ++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 96d8e925b71..5d340c6f73f 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -163,6 +163,13 @@ public static void HideFromAltTab(Window window)
             SetWindowStyle(hwnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, (int)newExStyle);
         }
 
+        public static void BlockWindowMaximize(Window window, HwndSourceHook hook)
+        {
+            var handle = GetWindowHandle(window, true);
+            var hwndSource = HwndSource.FromHwnd(handle);
+            hwndSource.AddHook(hook);
+        }
+        
         /// <summary>
         /// Restore window display in the Alt+Tab window list.
         /// </summary>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index f15091e4a8d..49f180e8092 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -490,6 +490,12 @@ private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs
 
         #region Window WndProc
 
+        private const int WM_NCLBUTTONDBLCLK = 0x00A3;
+        private const int WM_SYSCOMMAND = 0x0112;
+        private const int SC_MAXIMIZE = 0xF030;
+        private const int SC_RESTORE = 0xF120;
+        private const int SC_MINIMIZE = 0xF020;
+        
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             if (msg == Win32Helper.WM_ENTERSIZEMOVE)
@@ -541,7 +547,20 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
                 handled = true;
             }
-
+            if (msg == WM_NCLBUTTONDBLCLK)
+            {
+                SizeToContent = SizeToContent.Height;
+                handled = true;
+            }
+            else if (msg == WM_SYSCOMMAND)
+            {
+                int command = wParam.ToInt32() & 0xFFF0;
+                if (command == SC_MAXIMIZE || command == SC_MINIMIZE)
+                {
+                    SizeToContent = SizeToContent.Height;
+                    handled = true;
+                }
+            }
             return IntPtr.Zero;
         }
 

From 8baf1d437e5d203b2eeaf7175927f51c10cbc6c6 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Mon, 2 Jun 2025 17:44:41 +0900
Subject: [PATCH 2/7] Prevent window height updates when exiting snap state and
 adjust border brush style

---
 Flow.Launcher/MainWindow.xaml.cs     | 22 ++++++++++++++--------
 Flow.Launcher/Themes/Win11Light.xaml |  3 ++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 49f180e8092..3f887171630 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -495,19 +495,20 @@ private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs
         private const int SC_MAXIMIZE = 0xF030;
         private const int SC_RESTORE = 0xF120;
         private const int SC_MINIMIZE = 0xF020;
-        
-        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (msg == Win32Helper.WM_ENTERSIZEMOVE)
-            {
-                _initialWidth = (int)Width;
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) 
+        { 
+            if (msg == Win32Helper.WM_ENTERSIZEMOVE) 
+            { 
+                _initialWidth = (int)Width; 
                 _initialHeight = (int)Height;
-
                 handled = true;
             }
             else if (msg == Win32Helper.WM_EXITSIZEMOVE)
             {
-                if (_initialHeight != (int)Height)
+                //Prevent updating the number of results when the window height is below the height of a single result item.
+                //This situation occurs not only when the user manually resizes the window, but also when the window is released from a side snap, as the OS automatically adjusts the window height.
+                //(Without this check, releasing from a snap can cause the window height to hit the minimum, resulting in only 2 results being shown.)
+                if (_initialHeight != (int)Height && Height> (_settings.WindowHeightSize + _settings.ItemHeightSize))
                 {
                     if (!_settings.KeepMaxResults)
                     {
@@ -533,6 +534,11 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
                     SizeToContent = SizeToContent.Height;
                 }
+                else
+                {
+                    // Update height when exiting maximized snap state.
+                    SizeToContent = SizeToContent.Height;
+                }
 
                 if (_initialWidth != (int)Width)
                 {
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 0c3e15c6dd9..06fbf403d47 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -73,8 +73,9 @@
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
+        <Setter Property="BorderBrush" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Background" Value="{DynamicResource Color01B}" />
+        <Setter Property="CornerRadius" Value="8" />
         <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style

From c6ed0bdc2aeac13cdf41e052ba9d1b8d801c9faf Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Mon, 2 Jun 2025 18:01:09 +0900
Subject: [PATCH 3/7] Adjust window border style for blur themes and update
 border brush resource

---
 Flow.Launcher.Core/Resource/Theme.cs | 10 +++++++++-
 Flow.Launcher/Themes/Win11Light.xaml |  3 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 059359694b4..a6e8dc6bf54 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -671,7 +671,15 @@ private void SetBlurForWindow(string theme, BackdropTypes backdropType)
                     windowBorderStyle.Setters.Remove(windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property.Name == "Background"));
                     windowBorderStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
                 }
-
+                
+                // For themes with blur enabled, the window border is rendered by the system, so it's treated as a simple rectangle regardless of thickness.
+                //(This is to avoid issues when the window is forcibly changed to a rectangular shape during snap scenarios.)
+                var cornerRadiusSetter = windowBorderStyle.Setters.OfType<Setter>().FirstOrDefault(x => x.Property == Border.CornerRadiusProperty);
+                if (cornerRadiusSetter != null)
+                    cornerRadiusSetter.Value = new CornerRadius(0);
+                else
+                    windowBorderStyle.Setters.Add(new Setter(Border.CornerRadiusProperty, new CornerRadius(0)));
+                
                 // Apply the blur effect
                 Win32Helper.DWMSetBackdropForWindow(mainWindow, backdropType);
                 ColorizeWindow(theme, backdropType);
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 06fbf403d47..0c3e15c6dd9 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -73,9 +73,8 @@
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
         <Setter Property="Background" Value="{DynamicResource Color01B}" />
-        <Setter Property="CornerRadius" Value="8" />
         <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style

From 08038dec94ada693d82b706f48a73d4e3d5be71c Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Mon, 2 Jun 2025 18:33:45 +0900
Subject: [PATCH 4/7] Improve window drag behavior when transitioning from
 maximized state

---
 Flow.Launcher/MainWindow.xaml.cs | 47 +++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 3f887171630..51339208db9 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -465,7 +465,52 @@ private void OnPreviewMouseMove(object sender, MouseEventArgs e)
 
         private void OnMouseDown(object sender, MouseButtonEventArgs e)
         {
-            if (e.ChangedButton == MouseButton.Left) DragMove();
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                try
+                {
+                    if (WindowState == WindowState.Maximized)
+                    {
+                        // 최대화된 창의 크기 기준으로 비율 계산
+                        double maxWidth = this.ActualWidth;
+                        double maxHeight = this.ActualHeight;
+                        var mousePos = e.GetPosition(this);
+                        double xRatio = mousePos.X / maxWidth;
+                        double yRatio = mousePos.Y / maxHeight;
+
+                        // 현재 모니터 정보
+                        var screen = Screen.FromHandle(new WindowInteropHelper(this).Handle);
+                        var workingArea = screen.WorkingArea;
+                        var screenLeftTop = Win32Helper.TransformPixelsToDIP(this, workingArea.X, workingArea.Y);
+
+                        // Normal로 전환
+                        WindowState = WindowState.Normal;
+
+                        Dispatcher.BeginInvoke(new Action(() =>
+                        {
+                            double normalWidth = Width;
+                            double normalHeight = Height;
+
+                            // 최대화된 창 크기와 Normal 창 크기 차이만큼 비율 적용
+                            Left = screenLeftTop.X + (maxWidth - normalWidth) * xRatio;
+                            Top = screenLeftTop.Y + (maxHeight - normalHeight) * yRatio;
+
+                            if (Mouse.LeftButton == MouseButtonState.Pressed)
+                            {
+                                DragMove();
+                            }
+                        }), DispatcherPriority.ApplicationIdle);
+                    }
+                    else
+                    {
+                        DragMove();
+                    }
+                }
+                catch (InvalidOperationException)
+                {
+                    // 무시
+                }
+            }
         }
 
         #endregion

From 556a4c881c836d6e779797b5f753343f1d8ab026 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Mon, 2 Jun 2025 19:16:01 +0900
Subject: [PATCH 5/7] Update Comment

---
 Flow.Launcher/MainWindow.xaml.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 51339208db9..13504fc93af 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -471,19 +471,19 @@ private void OnMouseDown(object sender, MouseButtonEventArgs e)
                 {
                     if (WindowState == WindowState.Maximized)
                     {
-                        // 최대화된 창의 크기 기준으로 비율 계산
+                        // Calculate ratio based on maximized window dimensions
                         double maxWidth = this.ActualWidth;
                         double maxHeight = this.ActualHeight;
                         var mousePos = e.GetPosition(this);
                         double xRatio = mousePos.X / maxWidth;
                         double yRatio = mousePos.Y / maxHeight;
 
-                        // 현재 모니터 정보
+                        // Current monitor information
                         var screen = Screen.FromHandle(new WindowInteropHelper(this).Handle);
                         var workingArea = screen.WorkingArea;
                         var screenLeftTop = Win32Helper.TransformPixelsToDIP(this, workingArea.X, workingArea.Y);
 
-                        // Normal로 전환
+                        // Switch to Normal state
                         WindowState = WindowState.Normal;
 
                         Dispatcher.BeginInvoke(new Action(() =>
@@ -491,7 +491,7 @@ private void OnMouseDown(object sender, MouseButtonEventArgs e)
                             double normalWidth = Width;
                             double normalHeight = Height;
 
-                            // 최대화된 창 크기와 Normal 창 크기 차이만큼 비율 적용
+                            // Apply ratio based on the difference between maximized and normal window sizes
                             Left = screenLeftTop.X + (maxWidth - normalWidth) * xRatio;
                             Top = screenLeftTop.Y + (maxHeight - normalHeight) * yRatio;
 
@@ -508,7 +508,7 @@ private void OnMouseDown(object sender, MouseButtonEventArgs e)
                 }
                 catch (InvalidOperationException)
                 {
-                    // 무시
+                    // Ignored - can occur if drag operation is already in progress
                 }
             }
         }

From 0ecc01d3281d9391466989c4bdf961403a435180 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Mon, 2 Jun 2025 19:19:41 +0900
Subject: [PATCH 6/7] Remove BlockWindowMaximize method from Win32Helper

---
 Flow.Launcher.Infrastructure/Win32Helper.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 5d340c6f73f..f864295c48d 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -162,13 +162,6 @@ public static void HideFromAltTab(Window window)
 
             SetWindowStyle(hwnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, (int)newExStyle);
         }
-
-        public static void BlockWindowMaximize(Window window, HwndSourceHook hook)
-        {
-            var handle = GetWindowHandle(window, true);
-            var hwndSource = HwndSource.FromHwnd(handle);
-            hwndSource.AddHook(hook);
-        }
         
         /// <summary>
         /// Restore window display in the Alt+Tab window list.

From 5aebf3f2812e05833569520fe3bc62e00cf6b3b7 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 2 Jun 2025 19:00:50 +0800
Subject: [PATCH 7/7] Remove unnecessary changes

---
 Flow.Launcher.Infrastructure/Win32Helper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index f864295c48d..96d8e925b71 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -162,7 +162,7 @@ public static void HideFromAltTab(Window window)
 
             SetWindowStyle(hwnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, (int)newExStyle);
         }
-        
+
         /// <summary>
         /// Restore window display in the Alt+Tab window list.
         /// </summary>