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

Merge branch 'macos26-explicit-window-corners' of https://github.com/zzhaolei/kitty

Browse Source
This commit is contained in:
Kovid Goyal
2026-04-18 22:37:08 +05:30
parent 75399c9026 b16221a1d3
commit e7aa197b27
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
glfw/cocoa_window.m
View File

@@ -3918,6 +3918,18 @@ apply_titlebar_color_settings(_GLFWwindow *window) {
#undef tc #undef tc
} }
static void
apply_window_corner_curve(_GLFWwindow *window) {
if (!window || !window->decorated) return;
if (@available(macOS 26.0, *)) {
GLFWWindow *nsw = window->ns.object;
NSView *frame_view = nsw.contentView.superview;
CALayer *layer = frame_view.layer;
if (!layer) return;
layer.cornerCurve = kCACornerCurveContinuous;
}
}
GLFWAPI void glfwCocoaSetWindowChrome(GLFWwindow *w, unsigned int color, bool use_system_color, unsigned int system_color, int background_blur, unsigned int hide_window_decorations, bool show_text_in_titlebar, int color_space, float background_opacity, bool resizable) { @autoreleasepool { GLFWAPI void glfwCocoaSetWindowChrome(GLFWwindow *w, unsigned int color, bool use_system_color, unsigned int system_color, int background_blur, unsigned int hide_window_decorations, bool show_text_in_titlebar, int color_space, float background_opacity, bool resizable) { @autoreleasepool {
@@ -4033,6 +4045,7 @@ GLFWAPI void glfwCocoaSetWindowChrome(GLFWwindow *w, unsigned int color, bool us
} }
#undef tc #undef tc
apply_titlebar_color_settings(window); apply_titlebar_color_settings(window);
apply_window_corner_curve(window);
// HACK: Changing the style mask can cause the first responder to be cleared // HACK: Changing the style mask can cause the first responder to be cleared
[nsw makeFirstResponder:window->ns.view]; [nsw makeFirstResponder:window->ns.view];

2
glfw/glfw.py
View File

@@ -175,7 +175,7 @@ def init_env(
elif module == 'cocoa': elif module == 'cocoa':
ans.cppflags.append('-DGL_SILENCE_DEPRECATION') ans.cppflags.append('-DGL_SILENCE_DEPRECATION')
for f_ in 'Cocoa IOKit CoreFoundation CoreVideo UniformTypeIdentifiers'.split(): for f_ in 'Cocoa IOKit CoreFoundation CoreVideo QuartzCore UniformTypeIdentifiers'.split():
ans.ldpaths.extend(('-framework', f_)) ans.ldpaths.extend(('-framework', f_))
elif module == 'wayland': elif module == 'wayland':