Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions macos/Sources/App/macOS/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ class AppDelegate: NSObject,
if settingsWindowController == nil {
let window = SettingsWindow(
contentRect: NSRect(x: 0, y: 0, width: 720, height: 500),
styleMask: [.titled, .closable, .miniaturizable, .resizable],
styleMask: [.titled, .closable, .miniaturizable],
backing: .buffered,
defer: false
)
Expand All @@ -1174,12 +1174,7 @@ class AppDelegate: NSObject,
window.isReleasedWhenClosed = false
window.collectionBehavior = [.moveToActiveSpace]

let toolbar = NSToolbar(identifier: "SettingsToolbar")
toolbar.showsBaselineSeparator = false
window.toolbar = toolbar
window.toolbarStyle = .unified

window.minSize = NSSize(width: 680, height: 450)
window.contentViewController = NSHostingController(rootView: SettingsView())
settingsWindowController = NSWindowController(window: window)
}
Expand Down
2 changes: 1 addition & 1 deletion macos/Sources/Features/Settings/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct SettingsView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
.navigationSplitViewStyle(.balanced)
.frame(minWidth: 680, minHeight: 450)
.frame(width: 680, height: 450)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Keep settings content resizable with the window

Using a fixed .frame(width: 680, height: 450) on the root NavigationSplitView makes the settings content lock to that exact size, so when users resize the settings window (it is still created with the .resizable style mask in AppDelegate), the split view no longer grows with the window and can leave unused blank space instead of expanding the detail/sidebar layout. This regression was introduced by replacing the previous minimum-size frame and is user-visible whenever the window is resized larger than 680×450.

Useful? React with 👍 / 👎.

}
}

Expand Down
Loading