From 45cfb405c0e34c69ccc483455d31febca60abb33 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 19 Nov 2014 14:40:10 +0100 Subject: [PATCH] GtkModelButton: Don't show both text and icon The intention was that ::iconic indicates which representation is preferred (text or icon). We fall back to the other representation if one is missing. --- gtk/gtkmodelbutton.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index 79977d4ddc..35772403b7 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -205,7 +205,7 @@ update_visibility (GtkModelButton *button) has_icon = gtk_image_get_storage_type (GTK_IMAGE (button->image)) != GTK_IMAGE_EMPTY; has_text = gtk_label_get_text (GTK_LABEL (button->label))[0] != '\0'; - gtk_widget_set_visible (button->image, has_icon); + gtk_widget_set_visible (button->image, has_icon && (button->iconic || !has_text)); gtk_widget_set_visible (button->label, has_text && (!button->iconic || !has_icon)); }