Enforce minimum window size

srwi · Jan 26, 2023 · 1f8af7a · 1f8af7a
1 parent d6a6149
commit 1f8af7a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/EverythingToolbar.Deskband/WindowPlacement.cs b/EverythingToolbar.Deskband/WindowPlacement.cs
@@ -58,9 +58,7 @@ private RECT CalculatePosition()
 
             int margin = GetMargin();
             Rectangle workingArea = Screen.PrimaryScreen.WorkingArea;
-            Size windowSize = Settings.Default.popupSize;
-            windowSize.Width /= DpiScalingFactor;
-            windowSize.Height /= DpiScalingFactor;
+            Size windowSize = GetTargetWindowSize();
             Edge taskbarEdge = TaskbarStateManager.Instance.TaskbarEdge;
 
             RECT windowPosition = new RECT();
@@ -84,6 +82,14 @@ private RECT CalculatePosition()
             return windowPosition;
         }
 
+        private Size GetTargetWindowSize()
+        {
+            Size windowSize = Settings.Default.popupSize;
+            windowSize.Width = Math.Max(windowSize.Width, AssociatedObject.MinWidth) / DpiScalingFactor;
+            windowSize.Height = Math.Max(windowSize.Height, AssociatedObject.MinHeight) / DpiScalingFactor;
+            return windowSize;
+        }
+
         private double GetScalingFactor()
         {
             IntPtr hwnd = ((HwndSource)PresentationSource.FromVisual(AssociatedObject)).Handle;

diff --git a/EverythingToolbar.Launcher/WindowPlacement.cs b/EverythingToolbar.Launcher/WindowPlacement.cs
@@ -46,9 +46,7 @@ private RECT CalculatePosition(double scalingFactor)
         {
             Screen screen = Screen.PrimaryScreen;
             TaskbarLocation taskbar = FindDockedTaskBar(screen);
-            Size windowSize = Settings.Default.popupSize;
-            windowSize.Width /= scalingFactor;
-            windowSize.Height /= scalingFactor;
+            Size windowSize = GetTargetWindowSize(scalingFactor);
             int margin = (int)(GetMargin() / scalingFactor);
 
             RECT windowPosition = new RECT();
@@ -85,6 +83,14 @@ private RECT CalculatePosition(double scalingFactor)
             return windowPosition;
         }
 
+        private Size GetTargetWindowSize(double scalingFactor)
+        {
+            Size windowSize = Settings.Default.popupSize;
+            windowSize.Width = Math.Max(windowSize.Width, AssociatedObject.MinWidth) / scalingFactor;
+            windowSize.Height = Math.Max(windowSize.Height, AssociatedObject.MinHeight) / scalingFactor;
+            return windowSize;
+        }
+
         private RECT SetHorizontalPosition(RECT windowPosition, Rectangle screenWorkingArea, Size windowSize, int margin)
         {
             if (Utils.IsTaskbarCenterAligned())