Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #862 from mitchellh/mrn/macos-menubar-non-native

Browse Source 
macOS: only unhide menu in non-native FS if focus lost to Ghostty
This commit is contained in:
Mitchell Hashimoto
2023-11-11 09:48:13 -08:00
committed by GitHub
parent 9a45bde44e ae9d7fc76a
commit eab35d0164
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
macos/Sources/Helpers/FullScreenHandler.swift
View File

@ -83,7 +83,7 @@ class FullScreenHandler {
object: window) object: window)
NotificationCenter.default.addObserver( NotificationCenter.default.addObserver(
self, self,
selector: #selector(FullScreenHandler.unHideMenu), selector: #selector(FullScreenHandler.onDidResignMain),
name: NSWindow.didResignMainNotification, name: NSWindow.didResignMainNotification,
object: window) object: window)
} }
@ -105,9 +105,17 @@ class FullScreenHandler {
NSApp.presentationOptions.insert(.autoHideMenuBar) NSApp.presentationOptions.insert(.autoHideMenuBar)
} }
@objc func unHideMenu() { @objc func onDidResignMain(_ notification: Notification) {
guard let resigningWindow = notification.object as? NSWindow else { return }
guard let mainWindow = NSApplication.shared.mainWindow else { return }
// We're only unhiding the menu bar, if the focus shifted within our application.
// In that case, `mainWindow` is the window of our application the focus shifted
// to.
if !resigningWindow.isEqual(mainWindow) {
NSApp.presentationOptions.remove(.autoHideMenuBar) NSApp.presentationOptions.remove(.autoHideMenuBar)
} }
}
@objc func hideDock() { @objc func hideDock() {
NSApp.presentationOptions.insert(.autoHideDock) NSApp.presentationOptions.insert(.autoHideDock)