AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 16:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'win32-runtime-immodule-swap-gtk4' into 'master'

Browse Source 
GDK W32: Support switching IM contexts at runtime (GTK4)

See merge request GNOME/gtk!372
This commit is contained in:
LRN 2018-10-07 09:05:16 +00:00
commit 10fef2fbb4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/win32/gdkevents-win32.c
View File

@ -2124,6 +2124,7 @@ gdk_event_translate (MSG *msg,
(gulong) msg->wParam, (gulong) msg->wParam,
(gpointer) msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "", (gpointer) msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "",
_gdk_input_codepage)); _gdk_input_codepage));
gdk_display_setting_changed (display, "gtk-im-module");
break; break;
case WM_SYSKEYUP: case WM_SYSKEYUP:

9
gdk/win32/gdkproperty-win32.c
View File

@ -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; return FALSE;
} }