diff options
| author |   mitchell <70453897+orbitalquark@users.noreply.github.com> | 2021-04-26 10:10:49 -0400 |
|---|---|---|
| committer | mitchell <70453897+orbitalquark@users.noreply.github.com> | 2021-04-26 10:10:49 -0400 |
| commit | 67f1b05766b4138dcbc80ad49fb0043037e07e1e (patch) | |
| tree | abf81b7c52b3c8924d0e7b3a0a440dc5dbd675fb /src/scintilla.patch | |
| parent | ce0da94145eb1faf155e586abddbae70f4f3bd46 (diff) | |
| download | textadept-67f1b05766b4138dcbc80ad49fb0043037e07e1e.tar.gz textadept-67f1b05766b4138dcbc80ad49fb0043037e07e1e.zip | |
Fixed Scintilla crash on macOS related to recent Scintilla changes.
Like Windows, macOS does not support font options.
Diffstat (limited to 'src/scintilla.patch')
| -rw-r--r-- | src/scintilla.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scintilla.patch b/src/scintilla.patch index 8523f3c5..3acf77cf 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -1,6 +1,6 @@ Scintilla changes: -* Fix GTK crash on Windows, as it does not support font options. +* Fix GTK crash on Windows and macOS, as they do not support font options. This patch has been submitted upstream. * Hijack SCI_CHANGEINSERTION for programmatically setting input method. This is helpful on newer versions of macOS, where changing the input method is flaky. @@ -13,7 +13,7 @@ diff -r 52d56f79dc0f gtk/ScintillaGTK.cxx } FontOptions::FontOptions(GtkWidget *widget) noexcept { -+#if !PLAT_GTK_WIN32 ++#if !PLAT_GTK_WIN32 && !PLAT_GTK_MACOSX PangoContext *pcontext = gtk_widget_create_pango_context(widget); PLATFORM_ASSERT(pcontext); const cairo_font_options_t *options = pango_cairo_context_get_font_options(pcontext); |