Fix hidden titlebar underlap and settings focus
This commit is contained in:
parent
f592d97126
commit
d67237b891
3 changed files with 105 additions and 8 deletions
|
|
@ -9,6 +9,30 @@ import Combine
|
|||
import ObjectiveC.runtime
|
||||
import Darwin
|
||||
|
||||
final class MainWindowHostingView<Content: View>: NSHostingView<Content> {
|
||||
private let zeroSafeAreaLayoutGuide = NSLayoutGuide()
|
||||
|
||||
override var safeAreaInsets: NSEdgeInsets { NSEdgeInsetsZero }
|
||||
override var safeAreaRect: NSRect { bounds }
|
||||
override var safeAreaLayoutGuide: NSLayoutGuide { zeroSafeAreaLayoutGuide }
|
||||
|
||||
required init(rootView: Content) {
|
||||
super.init(rootView: rootView)
|
||||
addLayoutGuide(zeroSafeAreaLayoutGuide)
|
||||
NSLayoutConstraint.activate([
|
||||
zeroSafeAreaLayoutGuide.leadingAnchor.constraint(equalTo: leadingAnchor),
|
||||
zeroSafeAreaLayoutGuide.trailingAnchor.constraint(equalTo: trailingAnchor),
|
||||
zeroSafeAreaLayoutGuide.topAnchor.constraint(equalTo: topAnchor),
|
||||
zeroSafeAreaLayoutGuide.bottomAnchor.constraint(equalTo: bottomAnchor),
|
||||
])
|
||||
}
|
||||
|
||||
@available(*, unavailable)
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
}
|
||||
|
||||
private enum CmuxThemeNotifications {
|
||||
static let reloadConfig = Notification.Name("com.cmuxterm.themes.reload-config")
|
||||
}
|
||||
|
|
@ -5457,7 +5481,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
|
|||
} else {
|
||||
window.center()
|
||||
}
|
||||
window.contentView = NSHostingView(rootView: root)
|
||||
window.contentView = MainWindowHostingView(rootView: root)
|
||||
|
||||
// Apply shared window styling.
|
||||
attachUpdateAccessory(to: window)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue