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

Merge branch 'label-double-focus' into 'master'

Browse Source 
Avoid double focus in labels

Closes #135

See merge request GNOME/gtk!1656
This commit is contained in:
Matthias Clasen 2020-04-10 01:34:49 +00:00
commit 3c9ada14fe
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtklabel.c
View File

@ -95,7 +95,7 @@
* *
* If the label has links, there is one subnode per link. These subnodes * If the label has links, there is one subnode per link. These subnodes
* carry the link or visited state depending on whether they have been * carry the link or visited state depending on whether they have been
* visited. * visited. In this case, label node also gets a .link style class.
* *
* # GtkLabel as GtkBuildable * # GtkLabel as GtkBuildable
* *
@ -2325,6 +2325,7 @@ gtk_label_set_markup_internal (GtkLabel *label,
priv->select_info->links = g_list_reverse (links); priv->select_info->links = g_list_reverse (links);
_gtk_label_accessible_update_links (label); _gtk_label_accessible_update_links (label);
gtk_label_ensure_has_tooltip (label); gtk_label_ensure_has_tooltip (label);
gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "link");
} }
if (with_uline) if (with_uline)
@ -3677,12 +3678,16 @@ gtk_label_snapshot (GtkWidget *widget,
range[0] = focus_link->start; range[0] = focus_link->start;
range[1] = focus_link->end; range[1] = focus_link->end;
gtk_style_context_save_to_node (context, focus_link->cssnode);
range_clip = gdk_pango_layout_get_clip_region (priv->layout, lx, ly, range, 1); range_clip = gdk_pango_layout_get_clip_region (priv->layout, lx, ly, range, 1);
cairo_region_get_extents (range_clip, &rect); cairo_region_get_extents (range_clip, &rect);
gtk_snapshot_render_focus (snapshot, context, rect.x, rect.y, rect.width, rect.height); gtk_snapshot_render_focus (snapshot, context, rect.x, rect.y, rect.width, rect.height);
cairo_region_destroy (range_clip); cairo_region_destroy (range_clip);
gtk_style_context_restore (context);
} }
} }
} }
@ -5795,6 +5800,7 @@ gtk_label_clear_links (GtkLabel *label)
g_list_free_full (priv->select_info->links, (GDestroyNotify) link_free); g_list_free_full (priv->select_info->links, (GDestroyNotify) link_free);
priv->select_info->links = NULL; priv->select_info->links = NULL;
priv->select_info->active_link = NULL; priv->select_info->active_link = NULL;
gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (label)), "link");
_gtk_label_accessible_update_links (label); _gtk_label_accessible_update_links (label);
} }

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

@ -42,7 +42,8 @@ dnd {
* Outlines * * Outlines *
********/ ********/
label:focus(visible), :focus(visible) link,
label:focus(visible):not(.link),
row:focus(visible), row:focus(visible),
flowboxchild:focus(visible) { flowboxchild:focus(visible) {
// We use the outline properties to signal the focus properties // We use the outline properties to signal the focus properties