diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-07-16 10:20:23 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-07-16 10:20:23 +1000 |
| commit | 335f4af10b617f51eb64ed4b15267e13cf587afa (patch) | |
| tree | 129ae76bab5d9f489bc9dda56360315f1b60cb61 /src/EditView.cxx | |
| parent | 97782cf42d51d2834a9a92f460a1cb7d483f09d7 (diff) | |
| download | scintilla-mirror-335f4af10b617f51eb64ed4b15267e13cf587afa.tar.gz | |
Backport: Make WrapMode an enum class for more type safety.
Backport of changeset 8413:ef7672c46486.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index cd7695620..cc6bf7e3b 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -61,7 +61,7 @@ using namespace Scintilla; PrintParameters::PrintParameters() noexcept { magnification = 0; colourMode = SC_PRINT_NORMAL; - wrapState = eWrapWord; + wrapState = WrapMode::word; } namespace Scintilla { @@ -578,12 +578,12 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa continue; } if (p > 0) { - if (vstyle.wrapState == eWrapChar) { + if (vstyle.wrapState == WrapMode::character) { lastGoodBreak = model.pdoc->MovePositionOutsideChar(p + posLineStart, -1) - posLineStart; p = model.pdoc->MovePositionOutsideChar(p + 1 + posLineStart, 1) - posLineStart; continue; - } else if ((vstyle.wrapState == eWrapWord) && (ll->styles[p] != ll->styles[p - 1])) { + } else if ((vstyle.wrapState == WrapMode::word) && (ll->styles[p] != ll->styles[p - 1])) { lastGoodBreak = p; } else if (IsSpaceOrTab(ll->chars[p - 1]) && !IsSpaceOrTab(ll->chars[p])) { lastGoodBreak = p; @@ -2400,7 +2400,7 @@ Sci::Position EditView::FormatRange(bool draw, const Sci_RangeToFormat *pfr, Sur Sci::Position nPrintPos = pfr->chrg.cpMin; int visibleLine = 0; int widthPrint = pfr->rc.right - pfr->rc.left - vsPrint.fixedColumnWidth; - if (printParameters.wrapState == eWrapNone) + if (printParameters.wrapState == WrapMode::none) widthPrint = LineLayout::wrapWidthInfinite; while (lineDoc <= linePrintLast && ypos < pfr->rc.bottom) { |