diff options
| author | mitchell <unknown> | 2018-05-05 12:49:25 -0400 |
|---|---|---|
| committer | mitchell <unknown> | 2018-05-05 12:49:25 -0400 |
| commit | 15be99cd0c446d74f71e9cf05ec3aa1c033a2370 (patch) | |
| tree | e0b1a37db946476f36322c4fbe8e6bedf5530703 /src/EditView.cxx | |
| parent | 386d275a0a0ea5b2725ff872fe8811cebecd2422 (diff) | |
| download | scintilla-mirror-15be99cd0c446d74f71e9cf05ec3aa1c033a2370.tar.gz | |
Backport: Split decorations into interface and implementation.
Backport of changeset 6658:693e737f3155.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index 7605ce839..d9ca751a0 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1042,25 +1042,25 @@ static void DrawIndicators(Surface *surface, const EditModel &model, const ViewS const Sci::Position lineStart = ll->LineStart(subLine); const Sci::Position posLineEnd = posLineStart + lineEnd; - for (const Decoration *deco : model.pdoc->decorations.View()) { + for (const IDecoration *deco : model.pdoc->decorations->View()) { if (under == vsDraw.indicators[deco->Indicator()].under) { Sci::Position startPos = posLineStart + lineStart; - if (!deco->rs.ValueAt(startPos)) { - startPos = deco->rs.EndRun(startPos); + if (!deco->ValueAt(startPos)) { + startPos = deco->EndRun(startPos); } - while ((startPos < posLineEnd) && (deco->rs.ValueAt(startPos))) { - const Range rangeRun(deco->rs.StartRun(startPos), deco->rs.EndRun(startPos)); + while ((startPos < posLineEnd) && (deco->ValueAt(startPos))) { + const Range rangeRun(deco->StartRun(startPos), deco->EndRun(startPos)); const Sci::Position endPos = std::min(rangeRun.end, posLineEnd); const bool hover = vsDraw.indicators[deco->Indicator()].IsDynamic() && rangeRun.ContainsCharacter(hoverIndicatorPos); - const int value = deco->rs.ValueAt(startPos); + const int value = deco->ValueAt(startPos); const Indicator::DrawState drawState = hover ? Indicator::drawHover : Indicator::drawNormal; const Sci::Position posSecond = model.pdoc->MovePositionOutsideChar(rangeRun.First() + 1, 1); DrawIndicator(deco->Indicator(), startPos - posLineStart, endPos - posLineStart, surface, vsDraw, ll, xStart, rcLine, posSecond - posLineStart, subLine, drawState, value); startPos = endPos; - if (!deco->rs.ValueAt(startPos)) { - startPos = deco->rs.EndRun(startPos); + if (!deco->ValueAt(startPos)) { + startPos = deco->EndRun(startPos); } } } @@ -1660,8 +1660,8 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi } if (vsDraw.indicatorsSetFore) { // At least one indicator sets the text colour so see if it applies to this segment - for (const Decoration *deco : model.pdoc->decorations.View()) { - const int indicatorValue = deco->rs.ValueAt(ts.start + posLineStart); + for (const IDecoration *deco : model.pdoc->decorations->View()) { + const int indicatorValue = deco->ValueAt(ts.start + posLineStart); if (indicatorValue) { const Indicator &indicator = vsDraw.indicators[deco->Indicator()]; const bool hover = indicator.IsDynamic() && |