aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cocoa/ScintillaView.h1
-rw-r--r--cocoa/ScintillaView.mm7
-rw-r--r--doc/ScintillaHistory.html3
3 files changed, 11 insertions, 0 deletions
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>