Merge pull request #1448 from ychin/fix-macos14-non-native-fullscreen-background-color

Fix macOS 14 Sonoma non-native full screen background color

Author: ychin

src/MacVim/MMCoreTextView.m

@@ -760,6 +760,17 @@ - (void)drawRect:(NSRect)rect
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     const BOOL clipTextToRow = [ud boolForKey:MMRendererClipToRowKey]; // Specify whether to clip tall characters by the row boundary.
 
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_14_0
+    // On macOS 14+ by default views don't clip their content, which is good as it allows tall texts
+    // on first line to be drawn fully without getting clipped. However, in this case we should make
+    // sure the background color fill is clipped properly, as otherwise it will interfere with
+    // non-native fullscreen's background color setting.
+    const BOOL clipBackground = !self.clipsToBounds;
+#else
+    const BOOL clipBackground = NO;
+#endif
+
     NSGraphicsContext *context = [NSGraphicsContext currentContext];
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
     CGContextRef ctx = context.CGContext;
@@ -791,7 +802,14 @@ - (void)drawRect:(NSRect)rect
     const unsigned defaultBg = defaultBackgroundColor.argbInt;
     CGContextSetFillColor(ctx, COMPONENTS(defaultBg));
 
+    if (clipBackground) {
+        CGContextSaveGState(ctx);
+        CGContextClipToRect(ctx, self.bounds);
+    }
     CGContextFillRect(ctx, rect);
+    if (clipBackground) {
+        CGContextRestoreGState(ctx);
+    }
 
     // Function to draw all rows
     void (^drawAllRows)(void (^)(CGContextRef,CGRect,int)) = ^(void (^drawFunc)(CGContextRef,CGRect,int)){

src/MacVim/MacVim.h

@@ -52,6 +52,9 @@
 #ifndef MAC_OS_VERSION_13_0
 # define MAC_OS_VERSION_13_0 130000
 #endif
+#ifndef MAC_OS_VERSION_14_0
+# define MAC_OS_VERSION_14_0 140000
+#endif
 
 #ifndef NSAppKitVersionNumber10_10
 # define NSAppKitVersionNumber10_10 1343