diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-10-17 16:05:05 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-10-17 16:24:00 -0400 |
| commit | 0ff2dbd6fcc9ddc031ed0d91e17c3b6b843c562c (patch) | |
| tree | be6b7f4f60c931b2a0cc87ab80da92b9e95b265c /gtk/gtkstackswitcher.c | |
| parent | fa6f83d89a85cad89b2e1bd3d008b946a4f37ac6 (diff) | |
| download | gtk+-0ff2dbd6fcc9ddc031ed0d91e17c3b6b843c562c.tar.gz | |
stackswitcher: Only show a button if the stack child is visible
Diffstat (limited to 'gtk/gtkstackswitcher.c')
| -rw-r--r-- | gtk/gtkstackswitcher.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index 8f683397cd..fdca8e91a0 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -179,7 +179,7 @@ update_button (GtkStackSwitcher *self, rebuild_child (button, icon_name, title); - gtk_widget_set_visible (button, title != NULL || icon_name != NULL); + gtk_widget_set_visible (button, gtk_widget_get_visible (widget) && (title != NULL || icon_name != NULL)); if (icon_name != NULL) gtk_widget_set_size_request (button, -1, -1); @@ -193,9 +193,9 @@ update_button (GtkStackSwitcher *self, } static void -on_title_icon_updated (GtkWidget *widget, - GParamSpec *pspec, - GtkStackSwitcher *self) +on_title_icon_visible_updated (GtkWidget *widget, + GParamSpec *pspec, + GtkStackSwitcher *self) { GtkWidget *button; GtkStackSwitcherPrivate *priv; @@ -266,8 +266,9 @@ add_child (GtkStackSwitcher *self, g_object_set_data (G_OBJECT (button), "stack-child", widget); g_signal_connect (button, "clicked", G_CALLBACK (on_button_clicked), self); - g_signal_connect (widget, "child-notify::title", G_CALLBACK (on_title_icon_updated), self); - g_signal_connect (widget, "child-notify::icon-name", G_CALLBACK (on_title_icon_updated), self); + g_signal_connect (widget, "notify::visible", G_CALLBACK (on_title_icon_visible_updated), self); + g_signal_connect (widget, "child-notify::title", G_CALLBACK (on_title_icon_visible_updated), self); + g_signal_connect (widget, "child-notify::icon-name", G_CALLBACK (on_title_icon_visible_updated), self); g_signal_connect (widget, "child-notify::position", G_CALLBACK (on_position_updated), self); g_signal_connect (widget, "child-notify::needs-attention", G_CALLBACK (on_needs_attention_updated), self); |