diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-12 18:20:24 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-12 18:20:24 -0400 |
| commit | ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 (patch) | |
| tree | 3e465bb700187ef104363c31525a73a4147c0edb /src/scintilla_backports/6134_0253f113f223.patch | |
| parent | f82726891b4cd2f323ce882e5aa6d71227dda887 (diff) | |
| download | textadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.tar.gz textadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.zip | |
Start using Scintilla's LongTerm3, which now includes Scintillua and Scinterm.
Since LongTerm3 requires a C++11 compiler, GCC 4.9+ is required.
Since C++11 includes regex capability, drop TRE dependency.
Diffstat (limited to 'src/scintilla_backports/6134_0253f113f223.patch')
| -rw-r--r-- | src/scintilla_backports/6134_0253f113f223.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/scintilla_backports/6134_0253f113f223.patch b/src/scintilla_backports/6134_0253f113f223.patch deleted file mode 100644 index aa1ffe61..00000000 --- a/src/scintilla_backports/6134_0253f113f223.patch +++ /dev/null @@ -1,36 +0,0 @@ -# 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)); - } - } - |