Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

macOS: only unhide manu in non-native FS if focus lost to Ghostty

Browse Source 
This fixes #786 by adding a check to the callback that unhides the menu
bar to only unhide the menu bar if focus was lost to another Ghostty
window.

That's the desired behaviour: when focus is lost to another app's
window, we want the non-native-fullscreen window to stay unchanged in
background, but when changing focus to another Ghostty window, we want
to unhide the menu bar.

Why did this problem even show up?

It started to show up with the introduction of the Xib-file based
approach, in 3018377.

Before that, in 27ddc90, for example, the app would receive the same
notifications, but the `.autoHideMenuBar` didn't have an effect on the
window. Only after adding the Xib-file did it start to have an effect.

So I figured there's two ways we could fix it:

1. Figure out why the `.autoHideMenuBar` now works with Xib-files and
   suppress it, or
2. Encode in the code the behaviour that we actually want: we only want
   to show the menu bar when focus shifts to another one of Ghostty's
   windows, but we want to leave it untouched when focus is lost to
   another app's window.

I went with (2) but I think (1) is also valid and happy to close PR if
that's what we want to do.
This commit is contained in:
Thorsten Ball
2023-11-11 07:35:57 +01:00
parent 8fcdd56496
commit ae9d7fc76a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ class FullScreenHandler {
object: window)
NotificationCenter.default.addObserver(
self,
selector: #selector(FullScreenHandler.unHideMenu),
selector: #selector(FullScreenHandler.onDidResignMain),
name: NSWindow.didResignMainNotification,
object: window)
}
@ -105,8 +105,16 @@ class FullScreenHandler {
NSApp.presentationOptions.insert(.autoHideMenuBar)
}
@objc func unHideMenu() {
NSApp.presentationOptions.remove(.autoHideMenuBar)
@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)
}
}
@objc func hideDock() {