From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 18 Feb 2021 04:25:31 +0000 (-0500)
Subject: text: Fix sticky preedit attrs
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~83^2^2~393^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=19b9967a72508d7eccb1c7048fcedd05c4ea7adf;p=gtk4.git

text: Fix sticky preedit attrs

In some cases, we were inadvertedly merging the
preedit attributes into priv->attrs, instead of
keeping them separate. This was causing the underlines
to grow beyond the preedit and never go away. One
place where this was showing up is the fontchooser
preview.

Fixes: #3679
---

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 6d10722e6b..3984750034 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -4365,9 +4365,9 @@ gtk_text_create_layout (GtkText  *self,
   pango_layout_set_single_paragraph_mode (layout, TRUE);
 
   tmp_attrs = gtk_css_style_get_pango_attributes (gtk_css_node_get_style (gtk_widget_get_css_node (widget)));
-  tmp_attrs = _gtk_pango_attr_list_merge (tmp_attrs, priv->attrs);
   if (!tmp_attrs)
     tmp_attrs = pango_attr_list_new ();
+  tmp_attrs = _gtk_pango_attr_list_merge (tmp_attrs, priv->attrs);
 
   display_text = gtk_text_get_display_text (self, 0, -1);