[gtk/wip/carlosg/imwayland-for-master: 5/12] imwayland: Fix clearing of preedit text in webkitgtk
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/carlosg/imwayland-for-master: 5/12] imwayland: Fix clearing of preedit text in webkitgtk
- Date: Tue, 18 Dec 2018 19:40:00 +0000 (UTC)
commit c4b4e90f9841923b78354afed1b298d6a26c9135
Author: Dorota Czaplejewicz <dorota czaplejewicz puri sm>
Date: Tue Sep 11 12:12:28 2018 +0000
imwayland: Fix clearing of preedit text in webkitgtk
Fixes webkitgtk misbehaviour as outlined in https://gitlab.gnome.org/GNOME/gtk/issues/1316#note_312942 ,
which was introduced in 49b17e6c.
The preedit will be cleared on exit only if it is already present.
gtk/gtkimcontextwayland.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c
index 13eea1b407..ee9902fa21 100644
--- a/gtk/gtkimcontextwayland.c
+++ b/gtk/gtkimcontextwayland.c
@@ -638,8 +638,11 @@ gtk_im_context_wayland_focus_out (GtkIMContext *context)
commit_state (context_wayland);
/* after disable, incoming state changes won't take effect anyway */
- text_input_preedit (global, global->text_input, NULL, 0, 0);
- text_input_preedit_apply (global);
+ if (context_wayland->current_preedit.text)
+ {
+ text_input_preedit (global, global->text_input, NULL, 0, 0);
+ text_input_preedit_apply (global);
+ }
global->current = NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]