[gtk/assorted-menu-fixes: 2/3] modelbutton: Don't show accels without text
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/assorted-menu-fixes: 2/3] modelbutton: Don't show accels without text
- Date: Fri, 17 Apr 2020 13:09:13 +0000 (UTC)
commit 17cb92889a62a72279e5ac3a03c1cfc40004982d
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Apr 17 09:04:26 2020 -0400
modelbutton: Don't show accels without text
We don't want to show accelerators in iconic buttons.
gtk/gtkmodelbutton.c | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 90249bfedb..a6501c1dd5 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -572,6 +572,9 @@ update_visibility (GtkModelButton *self)
gtk_widget_set_hexpand (self->label,
gtk_widget_get_visible (self->label) && !has_icon);
+ if (self->accel_label)
+ gtk_widget_set_visible (self->accel_label, has_text && (!self->iconic || !has_icon));
+
if (self->image)
{
gtk_widget_set_visible (self->image, has_icon && (self->iconic || !has_text));
@@ -792,6 +795,7 @@ gtk_model_button_set_accel (GtkModelButton *button,
g_free (button->accel);
button->accel = g_strdup (accel);
update_accel (button, button->accel);
+ update_visibility (button);
g_object_notify_by_pspec (G_OBJECT (button), properties[PROP_ACCEL]);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]