diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-09-13 11:27:44 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-09-13 11:27:44 +1000 |
| commit | 41a4aaf6ac518707850beee6158ab232d1bf7d03 (patch) | |
| tree | cb9bfb9457ca8e795565a42825d2c9de0d827691 | |
| parent | 4fd00bf67d398898a5fa53d7945e5714ceb9e1e1 (diff) | |
| download | scintilla-mirror-41a4aaf6ac518707850beee6158ab232d1bf7d03.tar.gz | |
Backport: Bug [#1971]. Fix line selection by clicking in the margin when scrolled.
Backport of changeset 6389:96506cab38bd.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 |
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; |