AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

label: Ignore AFFECTS_ATTRS css changes if we can

Browse Source 
It's only interesting if we either already have attributes, or the new
style adds some.
This commit is contained in:
Timm Bäder 2020-04-14 10:53:48 +02:00
parent 9ad0dbb145
commit 6289f7eecd
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtklabel.c
View File

@ -2798,12 +2798,12 @@ gtk_label_get_measuring_layout (GtkLabel *self,
}
static void
gtk_label_update_layout_attributes (GtkLabel *self)
gtk_label_update_layout_attributes (GtkLabel *self,
PangoAttrList *style_attrs)
{
GtkWidget *widget = GTK_WIDGET (self);
GtkCssStyle *style;
PangoAttrList *attrs;
PangoAttrList *style_attrs;
if (self->layout == NULL)
return;
@ -2855,7 +2855,9 @@ gtk_label_update_layout_attributes (GtkLabel *self)
attrs = NULL;
style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
if (!style_attrs)
style_attrs = gtk_css_style_get_pango_attributes (style);
if (style_attrs)
{
attrs = _gtk_pango_attr_list_merge (attrs, style_attrs);
@ -2884,7 +2886,7 @@ gtk_label_ensure_layout (GtkLabel *self)
rtl = _gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL;
self->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), self->text);
gtk_label_update_layout_attributes (self);
gtk_label_update_layout_attributes (self, NULL);
switch (self->jtype)
{
@ -3292,12 +3294,22 @@ gtk_label_css_changed (GtkWidget *widget,
GtkCssStyleChange *change)
{
GtkLabel *self = GTK_LABEL (widget);
gboolean attrs_affected;
PangoAttrList *new_attrs = NULL;
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))
gtk_label_update_layout_attributes (self);
if (gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_ATTRS))
{
new_attrs = gtk_css_style_get_pango_attributes (gtk_css_style_change_get_new_style (change));
attrs_affected = (self->layout && pango_layout_get_attributes (self->layout)) ||
new_attrs;
}
else
attrs_affected = FALSE;
if (change == NULL || attrs_affected || (self->select_info && self->select_info->links))
gtk_label_update_layout_attributes (self, new_attrs);
}
static PangoDirection