NSWindow+Transitions: Fixes sizing calculations

Automattic · Jun 20, 2024 · 222ea90 · 222ea90
1 parent 16801b2
commit 222ea90
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Simplenote/MagicLinkRequestedView.swift b/Simplenote/MagicLinkRequestedView.swift
@@ -60,8 +60,10 @@ struct MagicLinkRequestedView: View {
             .buttonStyle(PlainButtonStyle())
             .padding(.bottom, Metrics.buttonPaddingBottom)
         }
-        .frame(width: 380, height: 350)
-
+
+        .frame(width: 380)
+        .fixedSize()
+
         /// Force Light Mode (since the Authentication UI is all light!)
         .environment(\.colorScheme, .light)
     }

diff --git a/Simplenote/NSWindow+Transitions.swift b/Simplenote/NSWindow+Transitions.swift
@@ -27,9 +27,12 @@ extension NSWindow {
     /// Switches to the target ContentViewController, without animations
     ///
     func switchContentViewController(to viewController: NSViewController) {
-        let newSize = viewController.view.intrinsicContentSize
-        var frame = frame
+        let targetView = viewController.view
+        targetView.layoutSubtreeIfNeeded()
 
+        let newSize = targetView.intrinsicContentSize
+
+        var frame = frame
         frame.origin.y += frame.size.height - newSize.height
         frame.size = newSize