diff options
author | William Jon McCann <william.jon.mccann@gmail.com> | 2014-01-11 20:27:42 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2014-01-17 17:52:07 -0500 |
commit | 00326d3362feacadec3e7b81aa1dfcfd56b6b2cb (patch) | |
tree | cdaa6f1844a5e418e7ea4f7a57edd8bbbe225512 /gtk/gtkbbox.c | |
parent | 8db2ba425aaff107faaa4c7468be63f8ef2fa8e9 (diff) | |
download | gtk+-00326d3362feacadec3e7b81aa1dfcfd56b6b2cb.tar.gz |
Add an expand button box type
https://bugzilla.gnome.org/show_bug.cgi?id=720059
Diffstat (limited to 'gtk/gtkbbox.c')
-rw-r--r-- | gtk/gtkbbox.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 22ca734d8f..becdca2fba 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -349,6 +349,10 @@ gtk_button_box_set_layout (GtkButtonBox *widget, if (priv->layout_style != layout_style) { priv->layout_style = layout_style; + if (priv->layout_style == GTK_BUTTONBOX_EXPAND) + gtk_box_set_homogeneous (GTK_BOX (widget), TRUE); + else + gtk_box_set_homogeneous (GTK_BOX (widget), FALSE); g_object_notify (G_OBJECT (widget), "layout-style"); gtk_widget_queue_resize (GTK_WIDGET (widget)); } @@ -416,15 +420,25 @@ gtk_button_box_set_child_secondary (GtkButtonBox *widget, GtkWidget *child, gboolean is_secondary) { + GtkButtonBox *bbox; + g_return_if_fail (GTK_IS_BUTTON_BOX (widget)); g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (widget)); + bbox = GTK_BUTTON_BOX (widget); + g_object_set_data (G_OBJECT (child), GTK_BOX_SECONDARY_CHILD, is_secondary ? GINT_TO_POINTER (1) : NULL); gtk_widget_child_notify (child, "secondary"); + if (bbox->priv->layout_style == GTK_BUTTONBOX_EXPAND) + { + gtk_box_set_child_packing (GTK_BOX (bbox), child, TRUE, TRUE, 0, + is_secondary ? GTK_PACK_START : GTK_PACK_END); + } + if (gtk_widget_get_visible (GTK_WIDGET (widget)) && gtk_widget_get_visible (child)) gtk_widget_queue_resize (child); @@ -714,6 +728,7 @@ gtk_button_box_size_request (GtkWidget *widget, case GTK_BUTTONBOX_START: case GTK_BUTTONBOX_END: case GTK_BUTTONBOX_CENTER: + case GTK_BUTTONBOX_EXPAND: if (orientation == GTK_ORIENTATION_HORIZONTAL) requisition->width = total_size + ((nvis_children - 1)*spacing); else @@ -827,6 +842,13 @@ gtk_button_box_size_allocate (GtkWidget *widget, bbox = GTK_BUTTON_BOX (widget); priv = bbox->priv; + if (priv->layout_style == GTK_BUTTONBOX_EXPAND) + { + GTK_WIDGET_CLASS (gtk_button_box_parent_class)->size_allocate (widget, allocation); + return; + } + + orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (widget)); spacing = gtk_box_get_spacing (GTK_BOX (widget)); |