From 40fc39c0592c444e0b6aeb3b4f1b1d92da4a9bfb Mon Sep 17 00:00:00 2001
From: Rowan Daniell <unknown>
Date: Sat, 27 Nov 2021 14:45:43 +1100
Subject: Bug [#2299] Set active state correctly at creation.

---
 cocoa/ScintillaCocoa.mm   | 2 +-
 doc/ScintillaHistory.html | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index ed7150fa0..8786e7949 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -416,7 +416,7 @@ ScintillaCocoa::ScintillaCocoa(ScintillaView *sciView_, SCIContentView *viewCont
 	notifyProc = NULL;
 	capturedMouse = false;
 	isFirstResponder = false;
-	isActive = false;
+	isActive = NSApp.isActive;
 	enteredSetScrollingSize = false;
 	scrollSpeed = 1;
 	scrollTicks = 2000;
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 8d1d707f7..e324481e8 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -565,6 +565,7 @@
 	<td>Michael Neuroth</td>
 	<td>Arne Scheffler</td>
 	<td>Jan Dolinár</td>
+	<td>Rowan Daniell</td>
     </tr>
     </table>
     <h2>Releases</h2>
@@ -599,6 +600,10 @@
 	<a href="https://sourceforge.net/p/scintilla/bugs/2295/">Bug #2295</a>.
 	</li>
 	<li>
+	On Cocoa set active state correctly at creation.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2299/">Bug #2299</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