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

GtkDialog: Keep special-casing help buttons

Browse Source 
We used to move help buttons to the secondary position regardless
how they were added to the action area. Keep doing that, to avoid
breaking existing dialogs that rely on this behavior.

https://bugzilla.gnome.org/show_bug.cgi?id=735119
This commit is contained in:
Matthias Clasen 2014-08-28 20:58:27 -04:00
parent ef0280aeda
commit 7b3c81f688
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkdialog.c
View File

@ -1848,12 +1848,14 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
g_signal_connect_closure_by_id (object, signal_id, 0, closure, FALSE);
}
if (is_action)
if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->action_area)
{
if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->headerbar)
apply_response_for_action_area (dialog, GTK_WIDGET (object), ad->response_id);
}
else if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->headerbar)
{
if (is_action)
apply_response_for_header_bar (dialog, GTK_WIDGET (object), ad->response_id);
else if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->action_area)
apply_response_for_action_area (dialog, GTK_WIDGET (object), ad->response_id);
}
if (item->is_default)