aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-08-21 12:30:27 +1000
committerNeil <nyamatongwe@gmail.com>2020-08-21 12:30:27 +1000
commit96792018d4b57dd539228c2502e9cdfe6e3aee69 (patch)
treeb91a604428c6c66506a8af6fd8c433b58afe9822
parent1a0589a20247f658d137fa86d2479df6550b1c80 (diff)
downloadscintilla-mirror-96792018d4b57dd539228c2502e9cdfe6e3aee69.tar.gz
Bug [#2197]. Fixed bug where layout caching was ineffective.
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--src/EditView.cxx3
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 3e2e96561..59fce7492 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -603,6 +603,10 @@
Fixed bug where gradient indicators were not showing hovered appearance.
</li>
<li>
+ Fixed bug where layout caching was ineffective.
+ <a href="https://sourceforge.net/p/scintilla/bugs/2197/">Bug #2197</a>.
+ </li>
+ <li>
For SciTE, don't show the output pane for quiet jobs.
<a href="https://sourceforge.net/p/scintilla/feature-requests/1365/">Feature #1365</a>.
</li>
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 5a59c102e..967e2b5a5 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -410,7 +410,8 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa
chPrevious = chDoc;
numCharsInLine++;
}
- allSame = allSame && (ll->styles[numCharsInLine] == styleByte); // For eolFilled
+ const int styleByteLast = (posLineEnd > posLineStart) ? model.pdoc->StyleIndexAt(posLineEnd - 1) : 0;
+ allSame = allSame && (ll->styles[numCharsInLine] == styleByteLast); // For eolFilled
if (allSame) {
ll->validity = LineLayout::ValidLevel::positions;
} else {