diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-07-16 09:27:55 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-07-16 09:27:55 +1000 |
| commit | c2c917c1b04cbe1ad3bc61ca6a0d51d45b32c0d0 (patch) | |
| tree | 4f0b7cafa66064c6a9c9254b2f50f8ac2c55dd10 /src/EditView.cxx | |
| parent | 47aa162ca1136d96dea71ceab3ad440f16ede1fb (diff) | |
| download | scintilla-mirror-c2c917c1b04cbe1ad3bc61ca6a0d51d45b32c0d0.tar.gz | |
Rename validLevel to ValidLevel and make an enum class.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index e54899bbd..fe137f2c8 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -387,7 +387,7 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa if (posLineEnd >(posLineStart + ll->maxLineLength)) { posLineEnd = posLineStart + ll->maxLineLength; } - if (ll->validity == LineLayout::llCheckTextAndStyle) { + if (ll->validity == LineLayout::ValidLevel::checkTextAndStyle) { Sci::Position lineLength = posLineEnd - posLineStart; if (!vstyle.viewEOL) { lineLength = model.pdoc->LineEnd(line) - posLineStart; @@ -412,15 +412,15 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa } allSame = allSame && (ll->styles[numCharsInLine] == styleByte); // For eolFilled if (allSame) { - ll->validity = LineLayout::llPositions; + ll->validity = LineLayout::ValidLevel::positions; } else { - ll->validity = LineLayout::llInvalid; + ll->validity = LineLayout::ValidLevel::invalid; } } else { - ll->validity = LineLayout::llInvalid; + ll->validity = LineLayout::ValidLevel::invalid; } } - if (ll->validity == LineLayout::llInvalid) { + if (ll->validity == LineLayout::ValidLevel::invalid) { ll->widthLine = LineLayout::wrapWidthInfinite; ll->lines = 1; if (vstyle.edgeState == EDGE_BACKGROUND) { @@ -504,13 +504,13 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa } ll->numCharsInLine = numCharsInLine; ll->numCharsBeforeEOL = numCharsBeforeEOL; - ll->validity = LineLayout::llPositions; + ll->validity = LineLayout::ValidLevel::positions; } // Hard to cope when too narrow, so just assume there is space if (width < 20) { width = 20; } - if ((ll->validity == LineLayout::llPositions) || (ll->widthLine != width)) { + if ((ll->validity == LineLayout::ValidLevel::positions) || (ll->widthLine != width)) { ll->widthLine = width; if (width == LineLayout::wrapWidthInfinite) { ll->lines = 1; @@ -593,7 +593,7 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa } ll->lines++; } - ll->validity = LineLayout::llLines; + ll->validity = LineLayout::ValidLevel::lines; } } |