mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-13 20:14:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix keyboard input not working after toggling traditional fullscreen till the window is clicked in

Browse Source
This commit is contained in:
Kovid Goyal
2021-11-13 14:20:18 +05:30
parent 181178b0ea
commit 0965fc45f2
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glfw/cocoa_init.m
View File

@@ -470,7 +470,7 @@ is_modified_tab(NSEvent *event, NSEventModifierFlags modifierFlags) {
// ctrl+whatever+tab, option+cmd+tab
if (
(
(modifierFlags & NSEventModifierFlagControl) ||
(modifierFlags & NSEventModifierFlagControl) ||
modifierFlags == (NSEventModifierFlagOption | NSEventModifierFlagCommand)
) && [event.charactersIgnoringModifiers isEqualToString:@"\t"]
) return true;

5
glfw/cocoa_window.m
View File

@@ -2464,9 +2464,6 @@ bool _glfwPlatformToggleFullscreen(_GLFWwindow* w, unsigned int flags) {
[[NSApplication sharedApplication] setPresentationOptions: NSApplicationPresentationDefault];
w->ns.in_traditional_fullscreen = false;
}
// At this point keyboard input does not work even though isKeyWindow returns true
// Calling makeKeyAndOrderFront also has no effect. Neither does calling becomeKeyWindow
// Calling them after an interval with performSelector also has no effect
} else {
bool in_fullscreen = sm & NSWindowStyleMaskFullScreen;
if (!(in_fullscreen)) {
@@ -2479,6 +2476,8 @@ bool _glfwPlatformToggleFullscreen(_GLFWwindow* w, unsigned int flags) {
}
[window setStyleMask: sm];
}
// Changing the style mask causes the first responder to be cleared
[window makeFirstResponder:w->ns.view];
// If the dock and menubar are hidden going from maximized to fullscreen doesnt change the window size
// and macOS forgets to trigger windowDidResize, so call it ourselves
NSNotification *notification = [NSNotification notificationWithName:NSWindowDidResizeNotification object:window];