Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Wed, 23 Oct 2019 16:23:29 UTC
Commit: bdf7152ff0f2ec963f0707941291c2308e944133
https://github.com/geany/geany-osx/commit/bdf7152ff0f2ec963f0707941291c2308…
Log Message:
-----------
Add patch to fix scintilla input method when using im-quartz
Modified Paths:
--------------
patches/02-geany_scintilla_im_fix.patch
Modified: patches/02-geany_scintilla_im_fix.patch
38 lines changed, 38 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User Jiří Techet <techet(a)gmail.com>
+# Date 1571822802 -7200
+# Wed Oct 23 11:26:42 2019 +0200
+# Node ID 46e1cd396ba57332ec81628c7365bfc91ed207e1
+# Parent 4f8c3b19095af4f0d333f1b6aa1ff1e3a69d9f4c
+Call SetCandidateWindowPos() inside PreeditChanged()
+
+On macOS it is possible to long-press a key to get a popup offering to
+select characters with additional accents. This popup should appear
+at the position of the caret. Scintilla however only sets the
+caret position using gtk_im_context_set_cursor_location() for some
+input methods (which exclude im-quartz) so the caret position isn't
+set correctly and macOS always displays the popup at the very bottom
+of the screen.
+
+Moving SetCandidateWindowPos() into PreeditChanged() seems to fix
+the problem.
+
+diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx
+--- a/scintilla/gtk/ScintillaGTK.cxx
++++ b/scintilla/gtk/ScintillaGTK.cxx
+@@ -2442,7 +2442,6 @@
+ }
+
+ EnsureCaretVisible();
+- SetCandidateWindowPos();
+ ShowCaretAtCurrentPosition();
+ } catch (...) {
+ errorStatus = SC_STATUS_FAILURE;
+@@ -2487,6 +2486,7 @@
+ } else {
+ sciThis->PreeditChangedWindowedThis();
+ }
++ sciThis->SetCandidateWindowPos();
+ }
+
+ void ScintillaGTK::StyleSetText(GtkWidget *widget, GtkStyle *, void *) {
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Wed, 23 Oct 2019 16:11:13 UTC
Commit: 59c4ea6a2972b5d5f433b3601895fc8f0d534471
https://github.com/geany/geany-osx/commit/59c4ea6a2972b5d5f433b3601895fc8f0…
Log Message:
-----------
Add enchant config to the bundle
Modified Paths:
--------------
geany-gtk3.bundle
Modified: geany-gtk3.bundle
5 lines changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -144,9 +144,14 @@
<data>
${prefix}/share/mime
</data>
+ <!-- glib schemas -->
<data>
${prefix}/share/glib-2.0/schemas
</data>
+ <!-- enchant config -->
+ <data>
+ ${prefix}/share/enchant
+ </data>
<!-- Copy in the themes data. You may want to trim this to save space
in your bundle. -->
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Wed, 23 Oct 2019 16:10:56 UTC
Commit: c8802195a585fed7fe1294e1bc594509e7fe50a9
https://github.com/geany/geany-osx/commit/c8802195a585fed7fe1294e1bc594509e…
Log Message:
-----------
Remove translations for some modules to reduce bundle size
This saves about 30MB.
Modified Paths:
--------------
geany-gtk3.bundle
Modified: geany-gtk3.bundle
9 lines changed, 6 insertions(+), 3 deletions(-)
===================================================================
@@ -85,19 +85,22 @@
want to copy in to the bundle. The "dest" attribute is
optional, as usual. Bundler will find all translations of that
library/program under the indicated directory and copy them.-->
+
+ <!-- remove these to reduce bundle size
<translations name="glib20">
${prefix}/share/locale
</translations>
- <translations name="atk10">
+ <translations name="gtk30-properties">
${prefix}/share/locale
</translations>
- <translations name="gtk30">
+ <translations name="atk10">
${prefix}/share/locale
</translations>
<translations name="gdk-pixbuf">
${prefix}/share/locale
</translations>
- <translations name="gtk30-properties">
+ -->
+ <translations name="gtk30">
${prefix}/share/locale
</translations>
<translations name="gtk-mac-integration">
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).