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/6138_55368b05bb72.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/6138_55368b05bb72.patch')
| -rw-r--r-- | src/scintilla_backports/6138_55368b05bb72.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/src/scintilla_backports/6138_55368b05bb72.patch b/src/scintilla_backports/6138_55368b05bb72.patch new file mode 100644 index 00000000..7d6d4519 --- /dev/null +++ b/src/scintilla_backports/6138_55368b05bb72.patch @@ -0,0 +1,40 @@ +# HG changeset patch +# User Neil <nyamatongwe@gmail.com> +# Date 1489925352 -39600 +# Node ID 55368b05bb72a05862c4ffb6cb01a1ce70f64c0f +# Parent c3bba4a9193ea55175c309109e5bab8c87f2a0bd +Group non-single-phase drawing before text. + +diff -r c3bba4a9193e -r 55368b05bb72 src/EditView.cxx +--- a/src/EditView.cxx Thu Mar 16 14:05:22 2017 +1100 ++++ b/src/EditView.cxx Sun Mar 19 23:09:12 2017 +1100 +@@ -1846,18 +1846,18 @@ + xStart += static_cast<int>(ll->wrapIndent); + } + +- 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); +- } ++ if (phasesDraw != phasesOne) { ++ if (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); // Remove drawBack to not draw again in DrawFoldDisplayText ++ DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end, ++ xStart, subLine, subLineStart, background); ++ } + +- if (phase & drawIndicatorsBack) { +- DrawIndicators(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, lineRange.end, true, model.hoverIndicatorPos); +- if (phasesDraw != phasesOne) { ++ if (phase & drawIndicatorsBack) { ++ DrawIndicators(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, lineRange.end, true, model.hoverIndicatorPos); + DrawEdgeLine(surface, vsDraw, ll, rcLine, lineRange, xStart); + DrawMarkUnderline(surface, model, vsDraw, line, rcLine); + } |