Skip to content

Commit 80b4363

Browse files
authored
Merge pull request #12 from sidequery/nicosuave/fix-settings-layout
Fix settings window layout
2 parents f22ee8e + 0ef3c3a commit 80b4363

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

macos/Sources/App/macOS/AppDelegate.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ class AppDelegate: NSObject,
11651165
if settingsWindowController == nil {
11661166
let window = SettingsWindow(
11671167
contentRect: NSRect(x: 0, y: 0, width: 720, height: 500),
1168-
styleMask: [.titled, .closable, .miniaturizable, .resizable],
1168+
styleMask: [.titled, .closable, .miniaturizable],
11691169
backing: .buffered,
11701170
defer: false
11711171
)
@@ -1174,12 +1174,7 @@ class AppDelegate: NSObject,
11741174
window.isReleasedWhenClosed = false
11751175
window.collectionBehavior = [.moveToActiveSpace]
11761176

1177-
let toolbar = NSToolbar(identifier: "SettingsToolbar")
1178-
toolbar.showsBaselineSeparator = false
1179-
window.toolbar = toolbar
11801177
window.toolbarStyle = .unified
1181-
1182-
window.minSize = NSSize(width: 680, height: 450)
11831178
window.contentViewController = NSHostingController(rootView: SettingsView())
11841179
settingsWindowController = NSWindowController(window: window)
11851180
}

macos/Sources/Features/Settings/SettingsView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ struct SettingsView: View {
1717
.frame(maxWidth: .infinity, maxHeight: .infinity)
1818
}
1919
.navigationSplitViewStyle(.balanced)
20-
.frame(minWidth: 680, minHeight: 450)
20+
.frame(width: 680, height: 450)
2121
}
2222
}
2323

0 commit comments

Comments
 (0)