[gtk/wip/baedert/for-master] label: Ignore AFFECTS_ATTRS css changes if we have not attributes



commit dbd3f45ac5e7edab4fadf98dc8f247b6d8afca51
Author: Timm Bäder <mail baedert org>
Date:   Tue Apr 14 10:53:48 2020 +0200

    label: Ignore AFFECTS_ATTRS css changes if we have not attributes

 gtk/gtklabel.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 84bd669d6a..268d3936dc 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3292,11 +3292,14 @@ gtk_label_css_changed (GtkWidget         *widget,
                        GtkCssStyleChange *change)
 {
   GtkLabel *self = GTK_LABEL (widget);
+  gboolean attrs_affected;
 
   GTK_WIDGET_CLASS (gtk_label_parent_class)->css_changed (widget, change);
 
-  if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_ATTRS) ||
-      (self->select_info && self->select_info->links))
+  attrs_affected = (self->attrs || self->markup_attrs) &&
+                   gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_ATTRS);
+
+  if (change == NULL || attrs_affected  || (self->select_info && self->select_info->links))
     gtk_label_update_layout_attributes (self);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]