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

Merge branch 'wip/carlosg/immulticontext-display-switch' into 'main'

Browse Source 
gtkimmulticontext: Handle switches between displays

Closes #4805

See merge request GNOME/gtk!4605
This commit is contained in:
Matthias Clasen 2022-03-31 16:29:38 +00:00
commit 0128574ca1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkimmulticontext.c
View File

@ -314,6 +314,11 @@ gtk_im_multicontext_set_client_widget (GtkIMContext *context,
GtkIMContext *delegate; GtkIMContext *delegate;
GtkSettings *settings; GtkSettings *settings;
if (priv->client_widget == widget)
return;
gtk_im_multicontext_set_delegate (self, NULL, TRUE);
if (priv->client_widget != NULL) if (priv->client_widget != NULL)
{ {
settings = gtk_widget_get_settings (priv->client_widget); settings = gtk_widget_get_settings (priv->client_widget);
@ -332,11 +337,11 @@ gtk_im_multicontext_set_client_widget (GtkIMContext *context,
g_signal_connect (settings, "notify::gtk-im-module", g_signal_connect (settings, "notify::gtk-im-module",
G_CALLBACK (im_module_setting_changed), G_CALLBACK (im_module_setting_changed),
self); self);
}
delegate = gtk_im_multicontext_get_delegate (self); delegate = gtk_im_multicontext_get_delegate (self);
if (delegate) if (delegate)
gtk_im_context_set_client_widget (delegate, widget); gtk_im_context_set_client_widget (delegate, widget);
}
} }
static void static void