diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
| commit | d255bd6711955192f98bed8bf0b98872dab7fca6 (patch) | |
| tree | ad4d14573ece5e8117c9de7ae246ecf711f70680 /src/scintilla_backports/6135_34665edc7efd.patch | |
| parent | ea8dd79d8972d8a0e23d1be50cf26e3c2ccadda7 (diff) | |
| download | textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.tar.gz textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.zip | |
Effectively updated to Scintilla 3.7.4 with select backports to 3.7.3.
Scintilla 3.7.4 requires a C++11 compiler, which I do not have.
Diffstat (limited to 'src/scintilla_backports/6135_34665edc7efd.patch')
| -rw-r--r-- | src/scintilla_backports/6135_34665edc7efd.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/scintilla_backports/6135_34665edc7efd.patch b/src/scintilla_backports/6135_34665edc7efd.patch new file mode 100644 index 00000000..3f807467 --- /dev/null +++ b/src/scintilla_backports/6135_34665edc7efd.patch @@ -0,0 +1,20 @@ +# HG changeset patch +# User Neil <nyamatongwe@gmail.com> +# Date 1489632594 -39600 +# Node ID 34665edc7efdd526c62e426bb0f6267f64e156e7 +# Parent 0253f113f22359c009f415099cf635b2637def1e +For multiphase drawing ensure edges and mark underline drawn over fold tags by +moving background drawing of fold tags before edge line and mark underline. + +diff -r 0253f113f223 -r 34665edc7efd src/EditView.cxx +--- a/src/EditView.cxx Fri Mar 17 09:49:55 2017 +1100 ++++ b/src/EditView.cxx Thu Mar 16 13:49:54 2017 +1100 +@@ -1849,6 +1849,8 @@ + if ((phasesDraw != phasesOne) && (phase & drawBack)) { + DrawBackground(surface, model, vsDraw, ll, rcLine, lineRange, posLineStart, xStart, + subLine, background); ++ DrawFoldDisplayText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, drawBack); ++ phase = static_cast<DrawPhase>(phase & ~drawBack); + DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end, + xStart, subLine, subLineStart, background); + } |