diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2022-01-19 10:48:48 +0000 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2022-01-19 10:48:48 +0000 |
commit | 11eb66298da7dc0e1be4da983eb54f2d6bb30e39 (patch) | |
tree | 23900d7ec7b1dca6184ceba101afc8caba201e4d | |
parent | 6fd29e6600a78a0fe877c455faf1620be4917673 (diff) | |
parent | 45397534eb5cc12e8c353ddd18a888e21c91f8d9 (diff) | |
download | gtk+-11eb66298da7dc0e1be4da983eb54f2d6bb30e39.tar.gz |
Merge branch 'context-early' into 'main'
gtkimcontextwayland: Remember context on focus-in so enable can happen later
See merge request GNOME/gtk!4397
-rw-r--r-- | gtk/gtkimcontextwayland.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c index 8b372d048f..60e1e466bf 100644 --- a/gtk/gtkimcontextwayland.c +++ b/gtk/gtkimcontextwayland.c @@ -794,12 +794,13 @@ gtk_im_context_wayland_focus_in (GtkIMContext *context) global = gtk_im_context_wayland_global_get (gtk_widget_get_display (self->widget)); if (global->current == context) return; + + global->current = context; if (!global->text_input) return; if (self->gesture) gtk_event_controller_reset (GTK_EVENT_CONTROLLER (self->gesture)); - global->current = context; if (global->focused) enable (self, global); |