From 85d460039b0495d1c4c2cabad840801ac47aed1e Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Sun, 17 Nov 2013 11:54:22 +1100
Subject: =?UTF-8?q?Fix=20problem=20where=20cursor=20didn=E2=80=99t=20chang?=
 =?UTF-8?q?e=20over=20margin=20after=20showing=20a=20dialog.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cocoa/ScintillaView.h     | 1 +
 cocoa/ScintillaView.mm    | 7 +++++++
 doc/ScintillaHistory.html | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/cocoa/ScintillaView.h b/cocoa/ScintillaView.h
index 41be9fa51..39c008a61 100644
--- a/cocoa/ScintillaView.h
+++ b/cocoa/ScintillaView.h
@@ -134,6 +134,7 @@ extern NSString *const SCIUpdateUINotification;
 - (void) setMarginWidth: (int) width;
 - (void) scrollerAction: (id) sender;
 - (SCIContentView*) content;
+- (void) updateMarginCursors;
 
 // NSTextView compatibility layer.
 - (NSString*) string;
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 16d21974a..f64d1eaa1 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -208,6 +208,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
 
   // Trigger recreation of the cursor rectangle(s).
   [[self window] invalidateCursorRectsForView: self];
+  [mOwner updateMarginCursors];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1315,6 +1316,12 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
 
 //--------------------------------------------------------------------------------------------------
 
+- (void) updateMarginCursors {
+  [[self window] invalidateCursorRectsForView: marginView];
+}
+
+//--------------------------------------------------------------------------------------------------
+
 /**
  * Direct call into the backend to allow uninterpreted access to it. The values to be passed in and
  * the result heavily depend on the message that is used for the call. Refer to the Scintilla
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 3f7aac45d..683c103ed 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -511,6 +511,9 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1542/">Bug #1542</a>.
 	</li>
 	<li>
+	On Cocoa, correct cursor displayed in margin after showing dialog.
+	</li>
+	<li>
 	On Cocoa, multipaste mode now works.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1541/">Bug #1541</a>.
 	</li>
-- 
cgit v1.2.3