From a4c061ceedc1e00d0ba0c8f7ff0e193bdbd4e561 Mon Sep 17 00:00:00 2001
From: Rowan Daniell <unknown>
Date: Tue, 30 Nov 2021 12:39:03 +1100
Subject: Bug [#2292] Fix bug where margin would not draw when scrolled.

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

diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index aab78e4bd..eb18ad09e 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -202,6 +202,10 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
 	}
 }
 
+- (void) drawRect: (NSRect) rect {
+	owner.backend->PaintMargin(rect);
+}
+
 @end
 
 // Add owner property as a private category.
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index e324481e8..32901b87c 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -604,6 +604,10 @@
 	<a href="https://sourceforge.net/p/scintilla/bugs/2299/">Bug #2299</a>.
 	</li>
 	<li>
+	On macOS 12, fix bug where margin would not draw when scrolled.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2292/">Bug #2292</a>.
+	</li>
+	<li>
 	On GTK using Wayland, display autocompletion with window on a secondary monitor.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2296/">Bug #2296</a>,
 	<a href="https://sourceforge.net/p/scintilla/bugs/2261/">Bug #2261</a>.
-- 
cgit v1.2.3