AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 12:20:10 +00:00
Code Issues Projects Releases Wiki Activity

More auto-mnemonics tweaks

Browse Source 
When auto-mnemonics are on, hide mnemonics with insensitive target.
This commit is contained in:
Matthias Clasen 2009-12-20 18:29:47 -05:00
parent 6f421d1450
commit 72e41b41f5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtklabel.c
View File

@ -1582,9 +1582,6 @@ mnemonics_visible_apply (GtkWidget *widget,
label = GTK_LABEL (widget); label = GTK_LABEL (widget);
if (!label->use_underline)
return;
priv = GTK_LABEL_GET_PRIVATE (label); priv = GTK_LABEL_GET_PRIVATE (label);
mnemonics_visible = mnemonics_visible != FALSE; mnemonics_visible = mnemonics_visible != FALSE;
@ -2491,6 +2488,7 @@ gtk_label_set_pattern_internal (GtkLabel *label,
GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label); GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
PangoAttrList *attrs; PangoAttrList *attrs;
gboolean enable_mnemonics; gboolean enable_mnemonics;
gboolean auto_mnemonics;
g_return_if_fail (GTK_IS_LABEL (label)); g_return_if_fail (GTK_IS_LABEL (label));
@ -2499,10 +2497,14 @@ gtk_label_set_pattern_internal (GtkLabel *label,
g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)), g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
"gtk-enable-mnemonics", &enable_mnemonics, "gtk-enable-mnemonics", &enable_mnemonics,
"gtk-auto-mnemonics", &auto_mnemonics,
NULL); NULL);
if (enable_mnemonics && priv->mnemonics_visible && pattern && if (enable_mnemonics && priv->mnemonics_visible && pattern &&
GTK_WIDGET_IS_SENSITIVE (label)) (!auto_mnemonics ||
(GTK_WIDGET_IS_SENSITIVE (label) &&
(!label->mnemonic_widget ||
GTK_WIDGET_IS_SENSITIVE (label->mnemonic_widget)))))
attrs = gtk_label_pattern_to_attrs (label, pattern); attrs = gtk_label_pattern_to_attrs (label, pattern);
else else
attrs = NULL; attrs = NULL;