mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 18:51:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix fullscreen handling for macOS Split View to prevent crashes

Browse Source
This commit is contained in:
Andrey Paramonov
2026-02-28 17:56:19 +03:00
parent 7500c58e1c
commit 6d33cea816
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
glfw/cocoa_window.m
View File

@@ -3253,6 +3253,14 @@ bool _glfwPlatformToggleFullscreen(_GLFWwindow* w, unsigned int flags) {
// As of Big Turd NSWindowStyleMaskFullScreen is no longer usable // As of Big Turd NSWindowStyleMaskFullScreen is no longer usable
// Also no longer compatible after a minor release of macOS 10.15.7 // Also no longer compatible after a minor release of macOS 10.15.7
if (!w->ns.in_traditional_fullscreen) { if (!w->ns.in_traditional_fullscreen) {
// Apple throws NSGenericException if setStyleMask: clears
// NSWindowStyleMaskFullScreen outside a transition (see #9572).
// Split View sets this flag via the system, so fall back to
// Cocoa fullscreen toggle instead of the traditional path.
if (sm & NSWindowStyleMaskFullScreen) {
[window toggleFullScreen:nil];
return false;
}
w->ns.pre_full_screen_style_mask = sm; w->ns.pre_full_screen_style_mask = sm;
[window setStyleMask: NSWindowStyleMaskBorderless]; [window setStyleMask: NSWindowStyleMaskBorderless];
[[NSApplication sharedApplication] setPresentationOptions: NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock]; [[NSApplication sharedApplication] setPresentationOptions: NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock];
@@ -3260,7 +3268,9 @@ bool _glfwPlatformToggleFullscreen(_GLFWwindow* w, unsigned int flags) {
w->ns.in_traditional_fullscreen = true; w->ns.in_traditional_fullscreen = true;
} else { } else {
made_fullscreen = false; made_fullscreen = false;
[window setStyleMask: w->ns.pre_full_screen_style_mask]; // Same NSWindowStyleMaskFullScreen guard as glfwCocoaSetWindowChrome
NSWindowStyleMask fsmask = sm & NSWindowStyleMaskFullScreen;
[window setStyleMask: w->ns.pre_full_screen_style_mask | fsmask];
[[NSApplication sharedApplication] setPresentationOptions: NSApplicationPresentationDefault]; [[NSApplication sharedApplication] setPresentationOptions: NSApplicationPresentationDefault];
w->ns.in_traditional_fullscreen = false; w->ns.in_traditional_fullscreen = false;
} }

8
kitty/glfw.c
View File

@@ -1291,6 +1291,14 @@ intercept_cocoa_fullscreen(GLFWwindow *w) {
global_state.callback_os_window); global_state.callback_os_window);
return false; return false;
} }
// macOS Split View uses Cocoa fullscreen internally, so the window
// can end up with NSWindowStyleMaskFullScreen set even when
// macos_traditional_fullscreen is enabled. Redirecting to traditional
// fullscreen would crash in setStyleMask: (see #9572).
if (glfwIsFullscreen(w, 1)) {
global_state.callback_os_window->background_opacity.os_forces_opaque = false;
return false;
}
toggle_fullscreen_for_os_window(global_state.callback_os_window); toggle_fullscreen_for_os_window(global_state.callback_os_window);
global_state.callback_os_window = NULL; global_state.callback_os_window = NULL;
return true; return true;