diff options
| -rw-r--r-- | src/EditView.cxx | 8 | ||||
| -rw-r--r-- | src/Editor.cxx | 8 | ||||
| -rw-r--r-- | src/ViewStyle.cxx | 10 | ||||
| -rw-r--r-- | src/ViewStyle.h | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index fe137f2c8..5a59c102e 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -62,7 +62,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; @@ -2539,7 +2539,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) { diff --git a/src/Editor.cxx b/src/Editor.cxx index 763940389..1ece08feb 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -1471,7 +1471,7 @@ void Editor::UpdateSystemCaret() { } bool Editor::Wrapping() const noexcept { - return vs.wrapState != eWrapNone; + return vs.wrapState != WrapMode::none; } void Editor::NeedWrapping(Sci::Line docLineStart, Sci::Line docLineEnd) { @@ -6378,11 +6378,11 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return view.printParameters.colourMode; case SCI_SETPRINTWRAPMODE: - view.printParameters.wrapState = (wParam == SC_WRAP_WORD) ? eWrapWord : eWrapNone; + view.printParameters.wrapState = (wParam == SC_WRAP_WORD) ? WrapMode::word : WrapMode::none; break; case SCI_GETPRINTWRAPMODE: - return view.printParameters.wrapState; + return static_cast<sptr_t>(view.printParameters.wrapState); case SCI_GETSTYLEAT: if (static_cast<Sci::Position>(wParam) >= pdoc->Length()) @@ -6686,7 +6686,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { break; case SCI_GETWRAPMODE: - return vs.wrapState; + return static_cast<sptr_t>(vs.wrapState); case SCI_SETWRAPVISUALFLAGS: if (vs.SetWrapVisualFlags(static_cast<int>(wParam))) { diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index fab1a2406..e730d0622 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -278,7 +278,7 @@ void ViewStyle::Init(size_t stylesSize_) { ctrlCharPadding = 3; // +3 For a blank on front and rounded edge each side lastSegItalicsOffset = 2; - wrapState = eWrapNone; + wrapState = WrapMode::none; wrapVisualFlags = 0; wrapVisualFlagsLocation = 0; wrapVisualStartIndent = 0; @@ -508,16 +508,16 @@ bool ViewStyle::SetWrapState(int wrapState_) noexcept { WrapMode wrapStateWanted; switch (wrapState_) { case SC_WRAP_WORD: - wrapStateWanted = eWrapWord; + wrapStateWanted = WrapMode::word; break; case SC_WRAP_CHAR: - wrapStateWanted = eWrapChar; + wrapStateWanted = WrapMode::character; break; case SC_WRAP_WHITESPACE: - wrapStateWanted = eWrapWhitespace; + wrapStateWanted = WrapMode::whitespace; break; default: - wrapStateWanted = eWrapNone; + wrapStateWanted = WrapMode::none; break; } const bool changed = wrapState != wrapStateWanted; diff --git a/src/ViewStyle.h b/src/ViewStyle.h index e5bf375f4..c043cd45c 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -48,7 +48,7 @@ enum TabDrawMode {tdLongArrow=0, tdStrikeOut=1}; typedef std::map<FontSpecification, std::unique_ptr<FontRealised>> FontMap; -enum WrapMode { eWrapNone, eWrapWord, eWrapChar, eWrapWhitespace }; +enum class WrapMode { none, word, character, whitespace }; class ColourOptional : public ColourDesired { public: |