AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkDialog: Improve the buildable implementation

Browse Source 
When combining action child type with <action-widgets> to assign
response ids, we were not properly updating buttons that ended up
getting added to the headerbar before they have a response id.
Fix this by reapplying the headerbar button setup after parsing
<action-widgets>, and make sure to also update the suggested-action
style class.
This commit is contained in:
Matthias Clasen 2014-06-05 18:04:52 -04:00
parent 85a4b65f11
commit d724175e49
1 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gtk/gtkdialog.c
View File

@ -405,6 +405,27 @@ add_response_data (GtkDialog *dialog,
g_warning ("Only 'activatable' widgets can be packed into the action area of a GtkDialog"); g_warning ("Only 'activatable' widgets can be packed into the action area of a GtkDialog");
} }
static void
apply_response_for_header_bar (GtkDialog *dialog,
GtkWidget *child,
gint response_id)
{
GtkDialogPrivate *priv = dialog->priv;
GtkPackType pack;
if (response_id == GTK_RESPONSE_CANCEL || response_id == GTK_RESPONSE_HELP)
pack = GTK_PACK_START;
else
pack = GTK_PACK_END;
gtk_container_child_set (GTK_CONTAINER (priv->headerbar), child,
"pack-type", pack,
NULL);
if (response_id == GTK_RESPONSE_CANCEL || response_id == GTK_RESPONSE_CLOSE)
gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (priv->headerbar), FALSE);
}
static void static void
add_to_header_bar (GtkDialog *dialog, add_to_header_bar (GtkDialog *dialog,
GtkWidget *child, GtkWidget *child,
@ -413,16 +434,21 @@ add_to_header_bar (GtkDialog *dialog,
GtkDialogPrivate *priv = dialog->priv; GtkDialogPrivate *priv = dialog->priv;
gtk_widget_set_valign (child, GTK_ALIGN_CENTER); gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
gtk_container_add (GTK_CONTAINER (priv->headerbar), child);
if (response_id == GTK_RESPONSE_CANCEL || response_id == GTK_RESPONSE_HELP)
gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->headerbar), child);
else
gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->headerbar), child);
gtk_size_group_add_widget (priv->size_group, child); gtk_size_group_add_widget (priv->size_group, child);
apply_response_for_header_bar (dialog, child, response_id);
if (response_id == GTK_RESPONSE_CANCEL || response_id == GTK_RESPONSE_CLOSE) }
gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (priv->headerbar), FALSE);
static void
apply_response_for_action_area (GtkDialog *dialog,
GtkWidget *child,
gint response_id)
{
GtkDialogPrivate *priv = dialog->priv;
if (response_id == GTK_RESPONSE_HELP)
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (priv->action_area), child, TRUE);
} }
static void static void
@ -433,11 +459,8 @@ add_to_action_area (GtkDialog *dialog,
GtkDialogPrivate *priv = dialog->priv; GtkDialogPrivate *priv = dialog->priv;
gtk_widget_set_valign (child, GTK_ALIGN_BASELINE); gtk_widget_set_valign (child, GTK_ALIGN_BASELINE);
gtk_container_add (GTK_CONTAINER (priv->action_area), child); gtk_container_add (GTK_CONTAINER (priv->action_area), child);
apply_response_for_action_area (dialog, child, response_id);
if (response_id == GTK_RESPONSE_HELP)
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (priv->action_area), child, TRUE);
} }
static void static void
@ -498,6 +521,7 @@ add_action_widgets (GtkDialog *dialog)
update_suggested_action (dialog); update_suggested_action (dialog);
} }
} }
static GObject * static GObject *
gtk_dialog_constructor (GType type, gtk_dialog_constructor (GType type,
guint n_construct_properties, guint n_construct_properties,
@ -1860,16 +1884,13 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
closure = g_cclosure_new_object (G_CALLBACK (action_widget_activated), closure = g_cclosure_new_object (G_CALLBACK (action_widget_activated),
G_OBJECT (dialog)); G_OBJECT (dialog));
g_signal_connect_closure_by_id (object, g_signal_connect_closure_by_id (object, signal_id, 0, closure, FALSE);
signal_id,
0,
closure,
FALSE);
} }
if (ad->response_id == GTK_RESPONSE_HELP) if (!priv->use_header_bar)
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (priv->action_area), apply_response_for_action_area (dialog, GTK_WIDGET (object), ad->response_id);
GTK_WIDGET (object), TRUE); else
apply_response_for_header_bar (dialog, GTK_WIDGET (object), ad->response_id);
if (item->is_default) if (item->is_default)
gtk_widget_grab_default (GTK_WIDGET (object)); gtk_widget_grab_default (GTK_WIDGET (object));
@ -1879,6 +1900,8 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
} }
g_slist_free (parser_data->items); g_slist_free (parser_data->items);
g_slice_free (ActionWidgetsSubParserData, parser_data); g_slice_free (ActionWidgetsSubParserData, parser_data);
update_suggested_action (dialog);
} }
static void static void
@ -1890,7 +1913,9 @@ gtk_dialog_buildable_add_child (GtkBuildable *buildable,
if (!type) if (!type)
gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child)); gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
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
parent_buildable_iface->add_child (buildable, builder, child, type); parent_buildable_iface->add_child (buildable, builder, child, type);
} }