Merge pull request #98 from peterklingelhofer/feature/Correct-max-window-height-responsive-settings

feat(swift): Responsive settings window max height

Author: peterklingelhofer

swift/exhale.xcodeproj/project.pbxproj

@@ -490,7 +490,7 @@
 				CODE_SIGN_ENTITLEMENTS = exhale/exhale.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 205;
+				CURRENT_PROJECT_VERSION = 206;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"exhale/Preview Content\"";
 				DEVELOPMENT_TEAM = VZCHHV7VNW;
@@ -505,7 +505,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = peterklingelhofer.exhale;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = macosx;
@@ -524,7 +524,7 @@
 				CODE_SIGN_ENTITLEMENTS = exhale/exhale.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 205;
+				CURRENT_PROJECT_VERSION = 206;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"exhale/Preview Content\"";
 				DEVELOPMENT_TEAM = VZCHHV7VNW;
@@ -539,7 +539,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = peterklingelhofer.exhale;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = macosx;

swift/exhale/AppDelegate.swift

@@ -166,15 +166,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
 
         // Initialize the Settings Window
         settingsWindow = NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 246, height: 870),
+            contentRect: NSRect(x: 0, y: 0, width: 246, height: 300),
             styleMask: [.titled, .closable, .miniaturizable, .resizable],
             backing: .buffered,
             defer: false
         )
         settingsWindow.setValue("SettingsWindow3", forKey: "frameAutosaveName")
         settingsWindow.delegate = self
         settingsWindow.minSize = NSSize(width: 246, height: 300)
-        settingsWindow.maxSize = NSSize(width: 246, height: 870)
         let visualEffect = NSVisualEffectView()
         visualEffect.material = .hudWindow
         visualEffect.blendingMode = .behindWindow
@@ -220,6 +219,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             hostingView.trailingAnchor.constraint(equalTo: visualEffect.trailingAnchor),
         ])
 
+        // Compute max height dynamically from the SwiftUI content's intrinsic size
+        // so we never need to hardcode a pixel value when settings are added/removed.
+        let fittingSize = hostingView.fittingSize
+        let titleBarHeight: CGFloat = 28
+        let idealHeight = ceil(fittingSize.height + titleBarHeight)
+        settingsWindow.maxSize = NSSize(width: 246, height: idealHeight)
+        settingsWindow.setContentSize(NSSize(width: 246, height: fittingSize.height))
+
         settingsWindow.title = "exhale"
         toggleSettings(nil)
         setUpStatusItem()
@@ -442,7 +449,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
                     x: screenOrigin.x + x,
                     y: screenOrigin.y + y,
                     width: min(w, 246),
-                    height: min(h, 870)
+                    height: min(h, settingsWindow.maxSize.height)
                 )
                 settingsWindow.setFrame(restoredFrame, display: true)
             }