Merge branch 'wip/carlosg/ignore-null-preedit' into 'main'

imcontextwayland: Ignore preedit updates from NULL to NULL See merge request GNOME/gtk!4667
2022-05-03 17:37:36 +00:00
parent 3f6b5ccf4a d6fe6f495a
commit b0ccfce1d6
1 changed files with 3 additions and 0 deletions
--- a/gtk/gtkimcontextwayland.c
+++ b/gtk/gtkimcontextwayland.c
@@ -174,6 +174,9 @@ text_input_preedit_apply (GtkIMContextWaylandGlobal *global)
    return;

  context = GTK_IM_CONTEXT_WAYLAND (global->current);
+  if (context->pending_preedit.text == NULL &&
+      context->current_preedit.text == NULL)
+    return;

  state_change = ((context->pending_preedit.text == NULL)
                 != (context->current_preedit.text == NULL));