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 exit on screen change if the screen really changed

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-09-30 14:47:21 -07:00
parent ef5b835dc4
commit 93f0b9dce9
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
macos/Sources/Helpers/Fullscreen.swift
View File

@ -271,6 +271,14 @@ class NonNativeFullscreen: FullscreenStyle {
@objc func windowDidChangeScreen(_ notification: Notification) {
guard isFullscreen else { return }
guard let savedState else { return }
// This should always be true due to how we register but just be sure
guard let object = notification.object as? NSWindow,
object == window else { return }
// Our screens must have changed
guard savedState.screen != window.screen else { return }
// When we change screens, we simply exit fullscreen. Changing
// screens shouldn't naturally be possible, it can only happen
@ -306,6 +314,7 @@ class NonNativeFullscreen: FullscreenStyle {
/// The state that must be saved for non-native fullscreen to exit fullscreen.
class SavedState {
weak var screen: NSScreen?
let tabGroup: NSWindowTabGroup?
let tabGroupIndex: Int?
let contentFrame: NSRect
@ -315,6 +324,7 @@ class NonNativeFullscreen: FullscreenStyle {
init?(_ window: NSWindow) {
guard let contentView = window.contentView else { return nil }
self.screen = window.screen
self.tabGroup = window.tabGroup
self.tabGroupIndex = window.tabGroup?.windows.firstIndex(of: window)
self.contentFrame = window.convertToScreen(contentView.frame)