diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-05-20 16:38:48 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-05-20 16:38:48 +1000 |
| commit | 7f8a8cfb32aecb70fe10ef26fe096f4092f7e673 (patch) | |
| tree | 9363cf8193aff09a46a4c0d845e4d3762d749d89 /src/EditView.cxx | |
| parent | 1a4952f5f7b03e65dbe1f38fb7826748e5b8d66f (diff) | |
| download | scintilla-mirror-7f8a8cfb32aecb70fe10ef26fe096f4092f7e673.tar.gz | |
Prefer Sci::invalidPosition to INVALID_POSITION as Scintilla.h will eventually
not be visible to most code.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index b4eaa577f..c9343b0cd 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -626,7 +626,7 @@ void EditView::UpdateBidiData(const EditModel &model, const ViewStyle &vstyle, L Point EditView::LocationFromPosition(Surface *surface, const EditModel &model, SelectionPosition pos, Sci::Line topLine, const ViewStyle &vs, PointEnd pe, const PRectangle rcClient) { Point pt; - if (pos.Position() == INVALID_POSITION) + if (pos.Position() == Sci::invalidPosition) return pt; Sci::Line lineDoc = model.pdoc->SciLineFromPosition(pos.Position()); Sci::Position posLineStart = model.pdoc->LineStart(lineDoc); @@ -702,9 +702,9 @@ SelectionPosition EditView::SPositionFromLocation(Surface *surface, const EditMo visibleLine = 0; const Sci::Line lineDoc = model.pcs->DocFromDisplay(visibleLine); if (canReturnInvalid && (lineDoc < 0)) - return SelectionPosition(INVALID_POSITION); + return SelectionPosition(Sci::invalidPosition); if (lineDoc >= model.pdoc->LinesTotal()) - return SelectionPosition(canReturnInvalid ? INVALID_POSITION : + return SelectionPosition(canReturnInvalid ? Sci::invalidPosition : model.pdoc->Length()); const Sci::Position posLineStart = model.pdoc->LineStart(lineDoc); std::shared_ptr<LineLayout> ll = RetrieveLineLayout(lineDoc, model); @@ -749,7 +749,7 @@ SelectionPosition EditView::SPositionFromLocation(Surface *surface, const EditMo if (!canReturnInvalid) return SelectionPosition(ll->numCharsInLine + posLineStart); } - return SelectionPosition(canReturnInvalid ? INVALID_POSITION : posLineStart); + return SelectionPosition(canReturnInvalid ? Sci::invalidPosition : posLineStart); } /** @@ -797,7 +797,7 @@ Sci::Line EditView::DisplayFromPosition(Surface *surface, const EditModel &model Sci::Position EditView::StartEndDisplayLine(Surface *surface, const EditModel &model, Sci::Position pos, bool start, const ViewStyle &vs) { const Sci::Line line = model.pdoc->SciLineFromPosition(pos); std::shared_ptr<LineLayout> ll = RetrieveLineLayout(line, model); - Sci::Position posRet = INVALID_POSITION; + Sci::Position posRet = Sci::invalidPosition; if (surface && ll) { const Sci::Position posLineStart = model.pdoc->LineStart(line); LayoutLine(model, surface, vs, ll.get(), model.wrapWidth); |