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

label: Pull all pango attributes from the theme

Browse Source 
Dont' force an underline attribute here. Just ask the theme for the
text-decoration.
This commit is contained in:
Timm Bäder 2020-04-12 09:07:57 +02:00
parent 4737495e3c
commit 2e14ea84f3
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtklabel.c
View File

@ -2988,8 +2988,6 @@ gtk_label_update_layout_attributes (GtkLabel *label)
if (priv->select_info && priv->select_info->links) if (priv->select_info && priv->select_info->links)
{ {
const GdkRGBA *link_color;
PangoAttribute *attribute;
guint i; guint i;
attrs = pango_attr_list_new (); attrs = pango_attr_list_new ();
@ -2997,21 +2995,36 @@ gtk_label_update_layout_attributes (GtkLabel *label)
for (i = 0; i < priv->select_info->n_links; i++) for (i = 0; i < priv->select_info->n_links; i++)
{ {
const GtkLabelLink *link = &priv->select_info->links[i]; const GtkLabelLink *link = &priv->select_info->links[i];
const GdkRGBA *link_color;
attribute = pango_attr_underline_new (TRUE); PangoAttrList *link_attrs;
attribute->start_index = link->start; PangoAttribute *attr;
attribute->end_index = link->end; GSList *attributes;
pango_attr_list_insert (attrs, attribute); GSList *l;
style = gtk_css_node_get_style (link->cssnode); style = gtk_css_node_get_style (link->cssnode);
link_color = gtk_css_color_value_get_rgba (style->core->color); link_attrs = gtk_css_style_get_pango_attributes (style);
attribute = pango_attr_foreground_new (link_color->red * 65535, attributes = pango_attr_list_get_attributes (link_attrs);
link_color->green * 65535, for (l = attributes; l; l = l->next)
link_color->blue * 65535); {
attribute->start_index = link->start; attr = l->data;
attribute->end_index = link->end;
pango_attr_list_insert (attrs, attribute); attr->start_index = link->start;
attr->end_index = link->end;
pango_attr_list_insert (attrs, attr);
}
g_slist_free (attributes);
link_color = gtk_css_color_value_get_rgba (style->core->color);
attr = pango_attr_foreground_new (link_color->red * 65535,
link_color->green * 65535,
link_color->blue * 65535);
attr->start_index = link->start;
attr->end_index = link->end;
pango_attr_list_insert (attrs, attr);
pango_attr_list_unref (link_attrs);
} }
} }
else if (priv->markup_attrs && priv->attrs) else if (priv->markup_attrs && priv->attrs)

4
gtk/theme/Adwaita/_common.scss
View File

@ -1050,6 +1050,7 @@ list > row button.image-button:not(.flat) {
button:link, button:link,
link:link { link:link {
color: $link_color; color: $link_color;
text-decoration: underline;
&:visited { &:visited {
color: $link_visited_color; color: $link_visited_color;
@ -1097,9 +1098,6 @@ button:visited {
> label { > label {
@extend %link; @extend %link;
text-decoration-line: underline;
} }
} }