From d255bd6711955192f98bed8bf0b98872dab7fca6 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Fri, 7 Apr 2017 18:10:12 -0400 Subject: 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. --- src/scintilla_backports/6134_0253f113f223.patch | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/scintilla_backports/6134_0253f113f223.patch (limited to 'src/scintilla_backports/6134_0253f113f223.patch') 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 +# 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(rcSegment.left), static_cast(rcSegment.top)); +- surface->LineTo(static_cast(rcSegment.left), static_cast(rcSegment.bottom)); +- surface->MoveTo(static_cast(rcSegment.right), static_cast(rcSegment.top)); +- surface->LineTo(static_cast(rcSegment.right), static_cast(rcSegment.bottom)); +- surface->MoveTo(static_cast(rcSegment.left), static_cast(rcSegment.top)); +- surface->LineTo(static_cast(rcSegment.right), static_cast(rcSegment.top)); +- surface->MoveTo(static_cast(rcSegment.left), static_cast(rcSegment.bottom - 1)); +- surface->LineTo(static_cast(rcSegment.right), static_cast(rcSegment.bottom - 1)); ++ PRectangle rcBox = rcSegment; ++ rcBox.left = static_cast(RoundXYPosition(rcSegment.left)); ++ rcBox.right = static_cast(RoundXYPosition(rcSegment.right)); ++ surface->MoveTo(static_cast(rcBox.left), static_cast(rcBox.top)); ++ surface->LineTo(static_cast(rcBox.left), static_cast(rcBox.bottom)); ++ surface->MoveTo(static_cast(rcBox.right), static_cast(rcBox.top)); ++ surface->LineTo(static_cast(rcBox.right), static_cast(rcBox.bottom)); ++ surface->MoveTo(static_cast(rcBox.left), static_cast(rcBox.top)); ++ surface->LineTo(static_cast(rcBox.right), static_cast(rcBox.top)); ++ surface->MoveTo(static_cast(rcBox.left), static_cast(rcBox.bottom - 1)); ++ surface->LineTo(static_cast(rcBox.right), static_cast(rcBox.bottom - 1)); + } + } + -- cgit v1.2.3