From ac44ae12bec48707102598b86cba84aef94958f2 Mon Sep 17 00:00:00 2001
From: Dzmitry Neviadomski <nevack.d@gmail.com>
Date: Sat, 27 Feb 2021 15:29:01 +0300
Subject: [PATCH] Mini window UI fixes.

Fix Toolbar customization panel overlapping window.
Fix minimum size to not exceed screen width.
---
 Base.lproj/MainMenu.xib | 2 +-
 Window/MiniWindow.m     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 7e8e79f9e..7ce9fb503 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -562,7 +562,7 @@
             </connections>
             <point key="canvasLocation" x="130.5" y="131"/>
         </window>
-        <window title="Cog" separatorStyle="none" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Mini Window" animationBehavior="default" titlebarAppearsTransparent="YES" toolbarStyle="unified" id="2234" userLabel="Mini Window (Window)" customClass="MiniWindow">
+        <window title="Cog" separatorStyle="none" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Mini Window" animationBehavior="default" toolbarStyle="unified" id="2234" userLabel="Mini Window (Window)" customClass="MiniWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="192" y="547" width="640" height="0.0"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
diff --git a/Window/MiniWindow.m b/Window/MiniWindow.m
index 0628e6694..85cc62672 100644
--- a/Window/MiniWindow.m
+++ b/Window/MiniWindow.m
@@ -20,9 +20,14 @@
         [self setShowsResizeIndicator:NO];
         [self setExcludedFromWindowsMenu:YES];
         [[self standardWindowButton:NSWindowZoomButton] setEnabled:NO];
+
+        NSUInteger minWidth = 675; // Default width
+        for (NSScreen *screen in NSScreen.screens) {
+            minWidth = MIN(screen.visibleFrame.size.width, minWidth);
+        }
         // Disallow height resize.
-        [self setContentMinSize:NSMakeSize(675, 0)];
-        [self setContentMaxSize:NSMakeSize(CGFLOAT_MAX, 0)];
+        [self setContentMinSize:NSMakeSize(minWidth, 1)];
+        [self setContentMaxSize:NSMakeSize(CGFLOAT_MAX, 1)];
         [self setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
     }