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/6132_6cf19f2bf214.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/6132_6cf19f2bf214.patch')
| -rw-r--r-- | src/scintilla_backports/6132_6cf19f2bf214.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/scintilla_backports/6132_6cf19f2bf214.patch b/src/scintilla_backports/6132_6cf19f2bf214.patch new file mode 100644 index 00000000..3ef0f6c7 --- /dev/null +++ b/src/scintilla_backports/6132_6cf19f2bf214.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Neil <nyamatongwe@gmail.com> +# Date 1489631977 -39600 +# Node ID 6cf19f2bf214b1d1dc0ba05412a6659142c772ec +# Parent a78e38849624fca65cd615da3f976d22db03a48b +Fix difference between right of line end and left of fold tag. + +diff -r a78e38849624 -r 6cf19f2bf214 src/EditView.cxx +--- a/src/EditView.cxx Thu Mar 16 10:16:39 2017 +1100 ++++ b/src/EditView.cxx Thu Mar 16 13:39:37 2017 +1100 +@@ -1087,7 +1087,7 @@ + + const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth; + XYPOSITION virtualSpace = model.sel.VirtualSpaceFor(model.pdoc->LineEnd(line)) * spaceWidth; +- rcSegment.left = xStart + static_cast<XYPOSITION>(ll->positions[ll->numCharsInLine] - subLineStart) + spaceWidth + virtualSpace; ++ rcSegment.left = xStart + static_cast<XYPOSITION>(ll->positions[ll->numCharsInLine] - subLineStart) + virtualSpace + vsDraw.aveCharWidth; + rcSegment.right = rcSegment.left + static_cast<XYPOSITION>(widthFoldDisplayText); + + ColourOptional background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret); |