aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--src/Editor.cxx2
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 9a1eb8a1d..db350e43a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -591,6 +591,10 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1919/">Bug #1919</a>.
</li>
<li>
+ On Cocoa, fix line selection by clicking in the margin when scrolled.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1971">Bug #1971</a>.
+ </li>
+ <li>
Ensure redraw when application changes overtype mode so caret change visible even when not blinking.
Notify application with SC_UPDATE_SELECTION when overtype changed - previously
sent SC_UPDATE_CONTENT.
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 766d0fac2..80b1d7ad3 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4320,6 +4320,8 @@ bool Editor::PointInSelMargin(Point pt) const {
PRectangle rcSelMargin = GetClientRectangle();
rcSelMargin.right = static_cast<XYPOSITION>(vs.textStart - vs.leftMarginWidth);
rcSelMargin.left = static_cast<XYPOSITION>(vs.textStart - vs.fixedColumnWidth);
+ const Point ptOrigin = GetVisibleOriginInMain();
+ rcSelMargin.Move(0, -ptOrigin.y);
return rcSelMargin.ContainsWholePixel(pt);
} else {
return false;