aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla_backports/6134_0253f113f223.patch
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2017-04-07 18:10:12 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2017-04-07 18:10:12 -0400
commitd255bd6711955192f98bed8bf0b98872dab7fca6 (patch)
treead4d14573ece5e8117c9de7ae246ecf711f70680 /src/scintilla_backports/6134_0253f113f223.patch
parentea8dd79d8972d8a0e23d1be50cf26e3c2ccadda7 (diff)
downloadtextadept-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/6134_0253f113f223.patch')
-rw-r--r--src/scintilla_backports/6134_0253f113f223.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/src/scintilla_backports/6134_0253f113f223.patch b/src/scintilla_backports/6134_0253f113f223.patch
new file mode 100644
index 00000000..aa1ffe61
--- /dev/null
+++ b/src/scintilla_backports/6134_0253f113f223.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Neil <nyamatongwe@gmail.com>
+# Date 1489704595 -39600
+# Node ID 0253f113f22359c009f415099cf635b2637def1e
+# Parent 30f1573f17ace82fd1adba69e733c4726f68e867
+Round left and right sides of fold text box to ensure within the allocation.
+
+diff -r 30f1573f17ac -r 0253f113f223 src/EditView.cxx
+--- a/src/EditView.cxx Thu Mar 16 13:40:19 2017 +1100
++++ b/src/EditView.cxx Fri Mar 17 09:49:55 2017 +1100
+@@ -1133,14 +1133,17 @@
+ if (phase & drawIndicatorsFore) {
+ if (model.foldDisplayTextStyle == SC_FOLDDISPLAYTEXT_BOXED) {
+ surface->PenColour(textFore);
+- surface->MoveTo(static_cast<int>(rcSegment.left), static_cast<int>(rcSegment.top));
+- surface->LineTo(static_cast<int>(rcSegment.left), static_cast<int>(rcSegment.bottom));
+- surface->MoveTo(static_cast<int>(rcSegment.right), static_cast<int>(rcSegment.top));
+- surface->LineTo(static_cast<int>(rcSegment.right), static_cast<int>(rcSegment.bottom));
+- surface->MoveTo(static_cast<int>(rcSegment.left), static_cast<int>(rcSegment.top));
+- surface->LineTo(static_cast<int>(rcSegment.right), static_cast<int>(rcSegment.top));
+- surface->MoveTo(static_cast<int>(rcSegment.left), static_cast<int>(rcSegment.bottom - 1));
+- surface->LineTo(static_cast<int>(rcSegment.right), static_cast<int>(rcSegment.bottom - 1));
++ PRectangle rcBox = rcSegment;
++ rcBox.left = static_cast<XYPOSITION>(RoundXYPosition(rcSegment.left));
++ rcBox.right = static_cast<XYPOSITION>(RoundXYPosition(rcSegment.right));
++ surface->MoveTo(static_cast<int>(rcBox.left), static_cast<int>(rcBox.top));
++ surface->LineTo(static_cast<int>(rcBox.left), static_cast<int>(rcBox.bottom));
++ surface->MoveTo(static_cast<int>(rcBox.right), static_cast<int>(rcBox.top));
++ surface->LineTo(static_cast<int>(rcBox.right), static_cast<int>(rcBox.bottom));
++ surface->MoveTo(static_cast<int>(rcBox.left), static_cast<int>(rcBox.top));
++ surface->LineTo(static_cast<int>(rcBox.right), static_cast<int>(rcBox.top));
++ surface->MoveTo(static_cast<int>(rcBox.left), static_cast<int>(rcBox.bottom - 1));
++ surface->LineTo(static_cast<int>(rcBox.right), static_cast<int>(rcBox.bottom - 1));
+ }
+ }
+