diff options
author | Neil <nyamatongwe@gmail.com> | 2018-06-06 09:00:10 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2018-06-06 09:00:10 +1000 |
commit | 353d99a99ef845b76c1189ecee0074102d1714f1 (patch) | |
tree | 277b22a0f6faa37fc7f9918e6e20eb25dd3326a9 | |
parent | 2cfe83dc91dbbdd195b17b5446ce595f0c658db2 (diff) | |
download | scintilla-mirror-353d99a99ef845b76c1189ecee0074102d1714f1.tar.gz |
Backport: Added brace for multi-line if and normalized space.
Backport of changeset 7025:f17e1a7e02e3.
-rw-r--r-- | src/EditView.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index 10a264d27..57567b13b 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -534,11 +534,12 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa break; } ll->wrapIndent = wrapAddIndent; - if (vstyle.wrapIndentMode != SC_WRAPINDENT_FIXED) - for (int i = 0; i < ll->numCharsInLine; i++) { - if (!IsSpaceOrTab(ll->chars[i])) { - ll->wrapIndent += ll->positions[i]; // Add line indent - break; + if (vstyle.wrapIndentMode != SC_WRAPINDENT_FIXED) { + for (int i = 0; i < ll->numCharsInLine; i++) { + if (!IsSpaceOrTab(ll->chars[i])) { + ll->wrapIndent += ll->positions[i]; // Add line indent + break; + } } } // Check for text width minimum @@ -622,7 +623,7 @@ Point EditView::LocationFromPosition(Surface *surface, const EditModel &model, S } Range EditView::RangeDisplayLine(Surface *surface, const EditModel &model, Sci::Line lineVisible, const ViewStyle &vs) { - Range rangeSubLine = Range(0,0); + Range rangeSubLine = Range(0, 0); if (lineVisible < 0) { return rangeSubLine; } |