From fd0a5dfdc646bfd5175976ce2df8ebffc7a94b96 Mon Sep 17 00:00:00 2001
From: Chinh Nguyen <unknown>
Date: Wed, 27 Sep 2023 15:51:34 +1000
Subject: Bug [#2402]. Fix invisible text on macOS 14 Sonoma when building with
 Xcode 15.

---
 cocoa/InfoBar.mm          | 1 +
 cocoa/ScintillaView.mm    | 3 +++
 doc/ScintillaHistory.html | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/cocoa/InfoBar.mm b/cocoa/InfoBar.mm
index 11d148fb8..652744d9d 100644
--- a/cocoa/InfoBar.mm
+++ b/cocoa/InfoBar.mm
@@ -95,6 +95,7 @@
 		mCurrentCaretX = 0;
 		mCurrentCaretY = 0;
 		[self createItems];
+		self.clipsToBounds = TRUE;
 	}
 	return self;
 }
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index cee96def5..4b5bf393a 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -202,6 +202,9 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
 }
 
 - (void) drawRect: (NSRect) rect {
+	if (!NSContainsRect(self.bounds, rect)) {
+	    rect = self.bounds;
+	}
 	[super drawRect:rect];
 }
 
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index bfa7ab60a..a2942ebf4 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -591,6 +591,10 @@
 	Released 22 September 2023.
 	</li>
 	<li>
+	For Cocoa, fix invisible text on macOS 14 Sonoma.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2402/">Bug #2402</a>.
+	</li>
+	<li>
 	For Cocoa, do nothing for suspendDrawing on macOS 10.14+ as the underlying calls have been deprecated.
 	</li>
     </ul>
-- 
cgit v1.2.3