diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2017-06-17 18:09:23 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2017-06-17 18:09:23 -0400 |
| commit | c79314c9bd8efc6e521664bf4de182370c436c09 (patch) | |
| tree | 9ce81d4de67843af7f293c2dc556e9c6e257bcb9 /src/scintilla_backports/6185_b8379bec8e70.patch | |
| parent | b82ab307b7ee8bcc547aa076c17355ad7bb7ea24 (diff) | |
| download | textadept-c79314c9bd8efc6e521664bf4de182370c436c09.tar.gz textadept-c79314c9bd8efc6e521664bf4de182370c436c09.zip | |
Effectively updated to Scintilla 3.7.5 with select backports to 3.7.3.
Diffstat (limited to 'src/scintilla_backports/6185_b8379bec8e70.patch')
| -rw-r--r-- | src/scintilla_backports/6185_b8379bec8e70.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/scintilla_backports/6185_b8379bec8e70.patch b/src/scintilla_backports/6185_b8379bec8e70.patch new file mode 100644 index 00000000..7d946ead --- /dev/null +++ b/src/scintilla_backports/6185_b8379bec8e70.patch @@ -0,0 +1,35 @@ +# HG changeset patch +# User Neil <nyamatongwe@gmail.com> +# Date 1492232428 -36000 +# Node ID b8379bec8e70bf09df25f01d0a78a53cf61b1827 +# Parent 692a54eaa6049d6ea3459f66c001ef0c8ea7668f +Fix deprecation of gdk_window_process_updates in GTK+ 3.22 by redrawing instead +of scrolling. + +diff -r 692a54eaa604 -r b8379bec8e70 gtk/ScintillaGTK.cxx +--- a/gtk/ScintillaGTK.cxx Sat Apr 15 14:28:09 2017 +1000 ++++ b/gtk/ScintillaGTK.cxx Sat Apr 15 15:00:28 2017 +1000 +@@ -1031,16 +1031,18 @@ + } + + void ScintillaGTK::ScrollText(Sci::Line linesToMove) { +- int diff = vs.lineHeight * -linesToMove; +- //Platform::DebugPrintf("ScintillaGTK::ScrollText %d %d %0d,%0d %0d,%0d\n", linesToMove, diff, +- // rc.left, rc.top, rc.right, rc.bottom); ++ NotifyUpdateUI(); ++ ++#if GTK_CHECK_VERSION(3,22,0) ++ Redraw(); ++#else + GtkWidget *wi = PWidget(wText); +- NotifyUpdateUI(); +- + if (IS_WIDGET_REALIZED(wi)) { ++ const int diff = vs.lineHeight * -linesToMove; + gdk_window_scroll(WindowFromWidget(wi), 0, -diff); + gdk_window_process_updates(WindowFromWidget(wi), FALSE); + } ++#endif + } + + void ScintillaGTK::SetVerticalScrollPos() { |