Merge branch 'clear_preedit_fix' into 'gtk-3-24'

imwayland: Fix clearing of preedit text

See merge request GNOME/gtk!329
This commit is contained in:
Matthias Clasen 2018-09-13 01:32:11 +00:00
commit 7d1d5119de

View File

@ -654,8 +654,11 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context)
commit_state (context_wayland); commit_state (context_wayland);
/* after disable, incoming state changes won't take effect anyway */ /* after disable, incoming state changes won't take effect anyway */
text_input_preedit (global, global->text_input, "", 0, 0); if (context_wayland->current_preedit.text)
text_input_preedit_apply (global); {
text_input_preedit (global, global->text_input, NULL, 0, 0);
text_input_preedit_apply (global);
}
global->current = NULL; global->current = NULL;
} }