diff options
author | Matthias Clasen <mclasen@redhat.com> | 2014-07-20 01:05:41 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2014-07-20 01:05:41 -0400 |
commit | 85297367dc5b4c10d2298566c203c2812b64b12c (patch) | |
tree | 346ffcb16885d2217ec3a044482605a2b7b66201 /gtk/gtkdialog.c | |
parent | 2cb1052987621c596ebfa55475ca38e66a6d346e (diff) | |
download | gtk+-85297367dc5b4c10d2298566c203c2812b64b12c.tar.gz |
GtkDialog: Manage action area visibility more carefully
People expect to be able to call gtk_widget_show_all on the dialog
to make action widgets visible, as seen e.g. in
https://bugzilla.gnome.org/show_bug.cgi?id=733431
To keep this working, we can't always set no-show-all on the
action_box. Only set it when the action_area is not used and empty.
Diffstat (limited to 'gtk/gtkdialog.c')
-rw-r--r-- | gtk/gtkdialog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 4e6dbc00b9..0075f98973 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -444,7 +444,8 @@ add_cb (GtkContainer *container, if (priv->use_header_bar) g_warning ("Content added to the action area of a dialog using header bars"); - gtk_widget_show (GTK_WIDGET (priv->action_box)); + gtk_widget_set_visible (priv->action_box, TRUE); + gtk_widget_set_no_show_all (priv->action_box, FALSE); } static void @@ -496,6 +497,7 @@ gtk_dialog_constructed (GObject *object) } gtk_widget_set_visible (priv->action_box, !priv->use_header_bar); + gtk_widget_set_no_show_all (priv->action_box, priv->use_header_bar); } static void |