diff options
| author | LRN <lrn1986@gmail.com> | 2018-10-07 09:05:16 +0000 |
|---|---|---|
| committer | LRN <lrn1986@gmail.com> | 2018-10-07 09:05:16 +0000 |
| commit | 10fef2fbb4861d938e69baa96fec7d17025a6a63 (patch) | |
| tree | 1fec7112c9971c148e3e4c881707cdaac9af3ed8 | |
| parent | 8e2fb9c2bebd96c24c5d10a83943b503e0ca686a (diff) | |
| parent | 66c0336ead9fd27cb93354336d113e8855406b22 (diff) | |
| download | gtk+-10fef2fbb4861d938e69baa96fec7d17025a6a63.tar.gz | |
Merge branch 'win32-runtime-immodule-swap-gtk4' into 'master'
GDK W32: Support switching IM contexts at runtime (GTK4)
See merge request GNOME/gtk!372
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 1 | ||||
| -rw-r--r-- | gdk/win32/gdkproperty-win32.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 40df7de157..73529b8ef9 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2124,6 +2124,7 @@ gdk_event_translate (MSG *msg, (gulong) msg->wParam, (gpointer) msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "", _gdk_input_codepage)); + gdk_display_setting_changed (display, "gtk-im-module"); break; case WM_SYSKEYUP: diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index 17729300df..be37ef7d0c 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -180,6 +180,15 @@ _gdk_win32_get_setting (const gchar *name, } } } + else if (strcmp ("gtk-im-module", name) == 0) + { + if (_gdk_input_locale_is_ime) + g_value_set_string (value, "ime"); + else + g_value_set_string (value, ""); + + return TRUE; + } return FALSE; } |