diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-03 07:40:42 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-03 07:40:42 +1000 |
| commit | 62ac2fcca76ba15f69ad050b9959088100481096 (patch) | |
| tree | 2fdcc33c6ec9ecde2e8a4cd08a68a0dc84a1dc6c | |
| parent | 1ca85ba4503e198b1c532181ad8eedfdb4929215 (diff) | |
| download | scintilla-mirror-62ac2fcca76ba15f69ad050b9959088100481096.tar.gz | |
Backport: Eliminate XFromPosition overload for Sci::Position as SelectionPosition overload
can always be used.
Backport of changeset 6785:161efa2f1972.
| -rw-r--r-- | src/Editor.cxx | 9 | ||||
| -rw-r--r-- | src/Editor.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index 28b7a1a35..356282882 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -376,11 +376,6 @@ Point Editor::LocationFromPosition(Sci::Position pos, PointEnd pe) { return LocationFromPosition(SelectionPosition(pos), pe); } -int Editor::XFromPosition(Sci::Position pos) { - const Point pt = LocationFromPosition(pos); - return static_cast<int>(pt.x) - vs.textStart + xOffset; -} - int Editor::XFromPosition(SelectionPosition sp) { const Point pt = LocationFromPosition(sp); return static_cast<int>(pt.x) - vs.textStart + xOffset; @@ -2150,8 +2145,8 @@ void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Posit } // Pad the end of lines with spaces if required sel.RangeMain().caret.SetPosition(PositionFromLineX(line, xInsert)); - if ((XFromPosition(sel.MainCaret()) < xInsert) && (i + 1 < len)) { - while (XFromPosition(sel.MainCaret()) < xInsert) { + if ((XFromPosition(sel.RangeMain().caret) < xInsert) && (i + 1 < len)) { + while (XFromPosition(sel.RangeMain().caret) < xInsert) { assert(pdoc); const Sci::Position lengthInserted = pdoc->InsertString(sel.MainCaret(), " ", 1); sel.RangeMain().caret.Add(lengthInserted); diff --git a/src/Editor.h b/src/Editor.h index 260139b94..bc295260e 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -284,7 +284,6 @@ protected: // ScintillaBase subclass needs access to much of Editor SelectionPosition ClampPositionIntoDocument(SelectionPosition sp) const; Point LocationFromPosition(SelectionPosition pos, PointEnd pe=peDefault); Point LocationFromPosition(Sci::Position pos, PointEnd pe=peDefault); - int XFromPosition(Sci::Position pos); int XFromPosition(SelectionPosition sp); SelectionPosition SPositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false, bool virtualSpace=true); Sci::Position PositionFromLocation(Point pt, bool canReturnInvalid = false, bool charPosition = false); |