AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 23:24:16 +00:00
Code Issues Projects Releases Wiki Activity

GtkDialog: rejigger headerbar handling

Browse Source 
We can't avoid calling set_titlebar in buildable_add_child, since
GtkBuilder assumes that it can e.g. call grab_default at the end,
which only works if the widget is inside a toplevel at that point.

Instead, drop the titlebar and clean up priv->headerbar in constructed
if we find that we don't want a headerbar.
This commit is contained in:
Matthias Clasen 2014-07-17 12:49:57 -04:00
parent df007fb982
commit 7b40714541
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkdialog.c
View File

@ -458,12 +458,6 @@ gtk_dialog_constructed (GObject *object)
if (priv->use_header_bar) if (priv->use_header_bar)
{ {
GList *children, *l; GList *children, *l;
gchar *title;
title = g_strdup (gtk_window_get_title (GTK_WINDOW (dialog)));
gtk_window_set_titlebar (GTK_WINDOW (dialog), priv->headerbar);
gtk_window_set_title (GTK_WINDOW (dialog), title);
g_free (title);
children = gtk_container_get_children (GTK_CONTAINER (priv->action_area)); children = gtk_container_get_children (GTK_CONTAINER (priv->action_area));
for (l = children; l != NULL; l = l->next) for (l = children; l != NULL; l = l->next)
@ -491,8 +485,12 @@ gtk_dialog_constructed (GObject *object)
g_signal_connect (priv->action_area, "add", G_CALLBACK (add_cb), dialog); g_signal_connect (priv->action_area, "add", G_CALLBACK (add_cb), dialog);
} }
else
{
gtk_window_set_titlebar (GTK_WINDOW (dialog), NULL);
priv->headerbar = NULL;
}
gtk_widget_set_visible (priv->headerbar, priv->use_header_bar);
gtk_widget_set_visible (priv->action_box, !priv->use_header_bar); gtk_widget_set_visible (priv->action_box, !priv->use_header_bar);
} }
@ -1874,12 +1872,11 @@ gtk_dialog_buildable_add_child (GtkBuildable *buildable,
if (type == NULL) if (type == NULL)
gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child)); gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
/* Don't call gtk_window_set_titlebar() until we know whether we want
* traditional titlebars or header bars.
*/
else if (g_str_equal (type, "titlebar")) else if (g_str_equal (type, "titlebar"))
priv->headerbar = GTK_WIDGET (child); {
priv->headerbar = GTK_WIDGET (child);
gtk_window_set_titlebar (GTK_WINDOW (buildable), priv->headerbar);
}
else if (g_strcmp0 (type, "action") == 0) else if (g_strcmp0 (type, "action") == 0)
gtk_dialog_add_action_widget (GTK_DIALOG (buildable), GTK_WIDGET (child), GTK_RESPONSE_NONE); gtk_dialog_add_action_widget (GTK_DIALOG (buildable), GTK_WIDGET (child), GTK_RESPONSE_NONE);
else else