diff options
| author | Neil <nyamatongwe@gmail.com> | 2016-12-09 09:30:17 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2016-12-09 09:30:17 +1100 |
| commit | d56b12f17f91afc131a670a28c1e12ebb3028d70 (patch) | |
| tree | babdbdb891808d1008264379199ab0250874a27f | |
| parent | 82ee0a0a14f83b3d85e7298f82165667c77b9a34 (diff) | |
| download | scintilla-mirror-d56b12f17f91afc131a670a28c1e12ebb3028d70.tar.gz | |
Warning suppression and documentation of previous change 6082.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | src/EditView.cxx | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 47cf8e7b1..d8cdcc2f3 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -529,6 +529,10 @@ <a href="http://sourceforge.net/p/scintilla/bugs/1888/">Bug #1888</a>. </li> <li> + Use more precision to allow selecting individual lines in files with + more than 16.7 million lines. + </li> + <li> For Qt 5, define QT_WS_MAC or QT_WS_X11 on those platforms. <a href="http://sourceforge.net/p/scintilla/bugs/1887/">Bug #1887</a>. </li> diff --git a/src/EditView.cxx b/src/EditView.cxx index b2855eb97..5c622568b 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -671,7 +671,8 @@ SelectionPosition EditView::SPositionFromLocation(Surface *surface, const EditMo const XYPOSITION subLineStart = ll->positions[rangeSubLine.start]; if (subLine > 0) // Wrapped pt.x -= ll->wrapIndent; - const int positionInLine = ll->FindPositionFromX(pt.x + subLineStart, rangeSubLine, charPosition); + const int positionInLine = ll->FindPositionFromX(static_cast<XYPOSITION>(pt.x + subLineStart), + rangeSubLine, charPosition); if (positionInLine < rangeSubLine.end) { return SelectionPosition(model.pdoc->MovePositionOutsideChar(positionInLine + posLineStart, 1)); } |