aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla.patch
diff options
context:
space:
mode:
authormitchell <70453897+orbitalquark@users.noreply.github.com>2020-10-02 19:49:44 -0400
committermitchell <70453897+orbitalquark@users.noreply.github.com>2020-10-02 19:49:44 -0400
commit6acd5de8214de4b4b35ca5bb607e3a14ab18b5a1 (patch)
tree1404d45e599f1a28c75de509f370b87f30ecc676 /src/scintilla.patch
parenta65b595bdd2f614fcf65eac3f07356456837ee06 (diff)
downloadtextadept-6acd5de8214de4b4b35ca5bb607e3a14ab18b5a1.tar.gz
textadept-6acd5de8214de4b4b35ca5bb607e3a14ab18b5a1.zip
Added Scintilla patch needed for drawing strikeout tabs in the terminal version.
Once the patch submitted upstream is accepted, this patch will not be needed.
Diffstat (limited to 'src/scintilla.patch')
-rw-r--r--src/scintilla.patch31
1 files changed, 28 insertions, 3 deletions
diff --git a/src/scintilla.patch b/src/scintilla.patch
index 5a4541b2..1d8006e9 100644
--- a/src/scintilla.patch
+++ b/src/scintilla.patch
@@ -1,8 +1,9 @@
Scintilla changes:
-Hijack SCI_LOADLEXERLIBRARY for programmatically setting input method.
-This is helpful on newer versions of macOS, where changing the input method is
-flaky.
+* Hijack SCI_LOADLEXERLIBRARY for programmatically setting input method.
+ This is helpful on newer versions of macOS, where changing the input method is
+ flaky.
+* Update DrawTabArrowFn() signature in order to draw strikeout tabs.
diff -r 6e368ee248e4 gtk/ScintillaGTK.cxx
--- a/gtk/ScintillaGTK.cxx Fri Oct 26 11:06:34 2018 -0400
@@ -19,3 +20,27 @@ diff -r 6e368ee248e4 gtk/ScintillaGTK.cxx
case SCI_TARGETASUTF8:
return TargetAsUTF8(CharPtrFromSPtr(lParam));
+diff -r 22b6bbb36280 src/EditView.cxx
+--- a/src/EditView.cxx Sat Sep 05 07:55:08 2020 +1000
++++ b/src/EditView.cxx Fri Oct 02 19:34:46 2020 -0400
+@@ -1951,7 +1951,7 @@
+ if (!customDrawTabArrow)
+ DrawTabArrow(surface, rcTab, segmentTop, vsDraw);
+ else
+- customDrawTabArrow(surface, rcTab, segmentTop);
++ customDrawTabArrow(surface, rcTab, segmentTop, vsDraw);
+ }
+ }
+ } else {
+diff -r 22b6bbb36280 src/EditView.h
+--- a/src/EditView.h Sat Sep 05 07:55:08 2020 +1000
++++ b/src/EditView.h Fri Oct 02 19:34:46 2020 -0400
+@@ -40,7 +40,7 @@
+ void DrawStyledText(Surface *surface, const ViewStyle &vs, int styleOffset, PRectangle rcText,
+ const StyledText &st, size_t start, size_t length, DrawPhase phase);
+
+-typedef void (*DrawTabArrowFn)(Surface *surface, PRectangle rcTab, int ymid);
++typedef void (*DrawTabArrowFn)(Surface *surface, PRectangle rcTab, int ymid, const ViewStyle &vsDraw);
+
+ class LineTabstops;
+