diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-11-20 11:05:28 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-11-20 11:05:28 +1100 |
| commit | 6652c4eadad09cf6ea23b690c92d70b55a49d57f (patch) | |
| tree | 955441c738e7e43de65414f956b16d678486eb1a /src/EditView.cxx | |
| parent | ad16ecb14a085d950b6a243b02267a0eca50f5c9 (diff) | |
| download | scintilla-mirror-6652c4eadad09cf6ea23b690c92d70b55a49d57f.tar.gz | |
Remove line end whitespace.
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 04b94a815..692740b7c 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -394,7 +394,7 @@ void EditView::LayoutLine(const EditModel &model, int line, Surface *surface, co allSame = allSame && (ll->chars[numCharsInLine] == static_cast<char>(toupper(chDoc))); else { // Style::caseCamel - if ((model.pdoc->WordCharClass(ll->chars[numCharsInLine]) == CharClassify::ccWord) && + if ((model.pdoc->WordCharClass(ll->chars[numCharsInLine]) == CharClassify::ccWord) && ((numCharsInLine == 0) || (model.pdoc->WordCharClass(ll->chars[numCharsInLine - 1]) != CharClassify::ccWord))) { allSame = allSame && (ll->chars[numCharsInLine] == static_cast<char>(toupper(chDoc))); } else { @@ -444,13 +444,13 @@ void EditView::LayoutLine(const EditModel &model, int line, Surface *surface, co else if (vstyle.styles[ll->styles[charInLine]].caseForce == Style::caseLower) ll->chars[charInLine] = static_cast<char>(tolower(chDoc)); else if (vstyle.styles[ll->styles[charInLine]].caseForce == Style::caseCamel) { - if ((model.pdoc->WordCharClass(ll->chars[charInLine]) == CharClassify::ccWord) && + if ((model.pdoc->WordCharClass(ll->chars[charInLine]) == CharClassify::ccWord) && ((charInLine == 0) || (model.pdoc->WordCharClass(ll->chars[charInLine - 1]) != CharClassify::ccWord))) { ll->chars[charInLine] = static_cast<char>(toupper(chDoc)); } else { ll->chars[charInLine] = static_cast<char>(tolower(chDoc)); } - } + } } } ll->xHighlightGuide = 0; @@ -1476,7 +1476,7 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi if (indicatorValue) { const Indicator &indicator = vsDraw.indicators[deco->indicator]; const bool hover = indicator.IsDynamic() && - ((model.hoverIndicatorPos >= ts.start + posLineStart) && + ((model.hoverIndicatorPos >= ts.start + posLineStart) && (model.hoverIndicatorPos <= ts.end() + posLineStart)); if (hover) { if (indicator.sacHover.style == INDIC_TEXTFORE) { |