* SECTION:gtkbox
* @Short_description: Base class for box containers
* @Title: GtkBox
- * @See_also:i #GtkHBox, #GtkVBox, #GtkFrame, #GtkTable, #GtkLayout
+ * @See_also: #GtkHBox, #GtkVBox, #GtkFrame, #GtkTable, #GtkLayout
*
* GtkBox is an widget which encapsulates functionality for a
* particular kind of container, one that organizes a variable number of
* of the GtkBox are forced to get the same amount of space.
*
* Use gtk_box_set_spacing() to determine how much space will be
- * minimally placed between all children in the GtkBox.
+ * minimally placed between all children in the GtkBox. Note that
+ * spacing is added <emphasis>between</emphasis> the children, while
+ * padding added by gtk_box_pack_start() or gtk_box_pack_end() is added
+ * <emphasis>on either side</emphasis> of the widget it belongs to.
*
* Use gtk_box_reorder_child() to move a GtkBox child to a different
* place in the box.
* Use gtk_box_set_child_packing() to reset the #GtkBox:expand,
* #GtkBox:fill and #GtkBox:padding child properties.
* Use gtk_box_query_child_packing() to query these fields.
+ *
+ * <note>
+ * <para>
+ * Note that a single-row or single-column #GtkGrid provides exactly the
+ * same functionality as #GtkBox.
+ * </para>
+ * </note>
*/
#include "config.h"
#include "gtkbox.h"
#include "gtkorientable.h"
#include "gtksizerequest.h"
+#include "gtktypeutils.h"
#include "gtkprivate.h"
#include "gtkintl.h"
CHILD_PROP_POSITION
};
-struct _GtkBoxPriv
+struct _GtkBoxPrivate
{
GtkOrientation orientation;
static void gtk_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
+static void gtk_box_compute_expand (GtkWidget *widget,
+ gboolean *hexpand,
+ gboolean *vexpand);
+
static void gtk_box_set_property (GObject *object,
guint prop_id,
const GValue *value,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-
static void gtk_box_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_box_remove (GtkContainer *container,
static GType gtk_box_child_type (GtkContainer *container);
-static void gtk_box_size_request_init (GtkSizeRequestIface *iface);
-static GtkSizeRequestMode gtk_box_get_request_mode (GtkSizeRequest *widget);
-static void gtk_box_get_width (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_box_get_height (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_box_get_width_for_height (GtkSizeRequest *widget,
- gint height,
- gint *minimum_width,
- gint *natural_width);
-static void gtk_box_get_height_for_width (GtkSizeRequest *widget,
- gint width,
- gint *minimum_height,
- gint *natural_height);
-
-static GtkSizeRequestIface *parent_size_request_iface;
+static GtkSizeRequestMode gtk_box_get_request_mode (GtkWidget *widget);
+static void gtk_box_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_box_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_box_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width);
+static void gtk_box_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height);
G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
- NULL)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
- gtk_box_size_request_init));
+ NULL))
static void
gtk_box_class_init (GtkBoxClass *class)
object_class->set_property = gtk_box_set_property;
object_class->get_property = gtk_box_get_property;
- widget_class->size_allocate = gtk_box_size_allocate;
+ widget_class->size_allocate = gtk_box_size_allocate;
+ widget_class->get_request_mode = gtk_box_get_request_mode;
+ widget_class->get_preferred_width = gtk_box_get_preferred_width;
+ widget_class->get_preferred_height = gtk_box_get_preferred_height;
+ widget_class->get_preferred_height_for_width = gtk_box_get_preferred_height_for_width;
+ widget_class->get_preferred_width_for_height = gtk_box_get_preferred_width_for_height;
+ widget_class->compute_expand = gtk_box_compute_expand;
container_class->add = gtk_box_add;
container_class->remove = gtk_box_remove;
container_class->child_type = gtk_box_child_type;
container_class->set_child_property = gtk_box_set_child_property;
container_class->get_child_property = gtk_box_get_child_property;
+ gtk_container_class_handle_border_width (container_class);
g_object_class_override_property (object_class,
PROP_ORIENTATION,
-1, G_MAXINT, 0,
GTK_PARAM_READWRITE));
- g_type_class_add_private (object_class, sizeof (GtkBoxPriv));
+ g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
}
static void
gtk_box_init (GtkBox *box)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
box->priv = G_TYPE_INSTANCE_GET_PRIVATE (box,
GTK_TYPE_BOX,
- GtkBoxPriv);
+ GtkBoxPrivate);
private = box->priv;
gtk_widget_set_has_window (GTK_WIDGET (box), FALSE);
GParamSpec *pspec)
{
GtkBox *box = GTK_BOX (object);
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
switch (prop_id)
{
GParamSpec *pspec)
{
GtkBox *box = GTK_BOX (object);
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
switch (prop_id)
{
gint *visible_children,
gint *expand_children)
{
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
GList *children;
GtkBoxChild *child;
if (gtk_widget_get_visible (child->widget))
{
*visible_children += 1;
- if (child->expand)
+ if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
*expand_children += 1;
}
}
GtkAllocation *allocation)
{
GtkBox *box = GTK_BOX (widget);
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
GtkBoxChild *child;
GList *children;
gint nvis_children;
gint nexpand_children;
- widget->allocation = *allocation;
+ GtkTextDirection direction;
+ GtkAllocation child_allocation;
+ GtkRequestedSize *sizes;
+
+ GtkPackType packing;
+
+ gint size;
+ gint extra;
+ gint n_extra_widgets = 0; /* Number of widgets that receive 1 extra px */
+ gint x = 0, y = 0, i;
+ gint child_size;
+
+
+ gtk_widget_set_allocation (widget, allocation);
count_expand_children (box, &nvis_children, &nexpand_children);
- if (nvis_children > 0)
+ /* If there is no visible child, simply return. */
+ if (nvis_children <= 0)
+ return;
+
+ direction = gtk_widget_get_direction (widget);
+ sizes = g_newa (GtkRequestedSize, nvis_children);
+
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ size = allocation->width - (nvis_children - 1) * private->spacing;
+ else
+ size = allocation->height - (nvis_children - 1) * private->spacing;
+
+ /* Retrieve desired size for visible children. */
+ for (i = 0, children = private->children; children; children = children->next)
{
- guint border_width = gtk_container_get_border_width (GTK_CONTAINER (box));
- GtkTextDirection direction = gtk_widget_get_direction (widget);
- GtkAllocation child_allocation;
- GtkRequestedSize *sizes = g_newa (GtkRequestedSize, nvis_children);
+ child = children->data;
- GtkPackType packing;
+ if (!gtk_widget_get_visible (child->widget))
+ continue;
- gint size;
- gint extra;
- gint x = 0, y = 0, i;
- gint child_size;
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_get_preferred_width_for_height (child->widget,
+ allocation->height,
+ &sizes[i].minimum_size,
+ &sizes[i].natural_size);
+ else
+ gtk_widget_get_preferred_height_for_width (child->widget,
+ allocation->width,
+ &sizes[i].minimum_size,
+ &sizes[i].natural_size);
+
+
+ /* Assert the api is working properly */
+ if (sizes[i].minimum_size < 0)
+ g_error ("GtkBox child %s minimum %s: %d < 0 for %s %d",
+ gtk_widget_get_name (GTK_WIDGET (child->widget)),
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
+ sizes[i].minimum_size,
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "height" : "width",
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? allocation->height : allocation->width);
+
+ if (sizes[i].natural_size < sizes[i].minimum_size)
+ g_error ("GtkBox child %s natural %s: %d < minimum %d for %s %d",
+ gtk_widget_get_name (GTK_WIDGET (child->widget)),
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
+ sizes[i].natural_size,
+ sizes[i].minimum_size,
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "height" : "width",
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? allocation->height : allocation->width);
+
+ size -= sizes[i].minimum_size;
+ size -= child->padding * 2;
+
+ sizes[i].data = child;
+
+ i++;
+ }
+ if (private->homogeneous)
+ {
+ /* If were homogenous we still need to run the above loop to get the
+ * minimum sizes for children that are not going to fill
+ */
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- size = allocation->width - border_width * 2 - (nvis_children - 1) * private->spacing;
+ size = allocation->width - (nvis_children - 1) * private->spacing;
else
- size = allocation->height - border_width * 2 - (nvis_children - 1) * private->spacing;
+ size = allocation->height - (nvis_children - 1) * private->spacing;
- /* Retrieve desired size for visible children */
- i = 0;
- children = private->children;
- while (children)
- {
- child = children->data;
- children = children->next;
+ extra = size / nvis_children;
+ n_extra_widgets = size % nvis_children;
+ }
+ else
+ {
+ /* Bring children up to size first */
+ size = gtk_distribute_natural_allocation (MAX (0, size), nvis_children, sizes);
- if (gtk_widget_get_visible (child->widget))
- {
- if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_size_request_get_width_for_height (GTK_SIZE_REQUEST (child->widget),
- allocation->height,
- &sizes[i].minimum_size,
- &sizes[i].natural_size);
- else
- gtk_size_request_get_height_for_width (GTK_SIZE_REQUEST (child->widget),
- allocation->width,
- &sizes[i].minimum_size,
- &sizes[i].natural_size);
-
-
- /* Assert the api is working properly */
- if (sizes[i].minimum_size < 0)
- g_error ("GtkBox child %s minimum %s: %d < 0 for %s %d",
- gtk_widget_get_name (GTK_WIDGET (child->widget)),
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
- sizes[i].minimum_size,
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "height" : "width",
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? allocation->height : allocation->width);
-
- if (sizes[i].natural_size < sizes[i].minimum_size)
- g_error ("GtkBox child %s natural %s: %d < minimum %d for %s %d",
- gtk_widget_get_name (GTK_WIDGET (child->widget)),
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
- sizes[i].natural_size,
- sizes[i].minimum_size,
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "height" : "width",
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? allocation->height : allocation->width);
-
- size -= sizes[i].minimum_size;
- size -= child->padding * 2;
-
- sizes[i].data = child;
-
- i += 1;
- }
+ /* Calculate space which hasn't distributed yet,
+ * and is available for expanding children.
+ */
+ if (nexpand_children > 0)
+ {
+ extra = size / nexpand_children;
+ n_extra_widgets = size % nexpand_children;
}
+ else
+ extra = 0;
+ }
- if (private->homogeneous)
+ /* Allocate child positions. */
+ for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
+ {
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- /* If were homogenous we still need to run the above loop to get the minimum sizes
- * for children that are not going to fill
- */
- if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- size = allocation->width - border_width * 2 - (nvis_children - 1) * private->spacing;
+ child_allocation.y = allocation->y;
+ child_allocation.height = MAX (1, allocation->height);
+ if (packing == GTK_PACK_START)
+ x = allocation->x;
else
- size = allocation->height - border_width * 2 - (nvis_children - 1) * private->spacing;
-
- extra = size / nvis_children;
- }
+ x = allocation->x + allocation->width;
+ }
else
{
- /* Bring children up to size first */
- size = gtk_distribute_natural_allocation (size, nvis_children, sizes);
-
- /* Calculate space which hasn't distributed yet,
- * and is available for expanding children.
- */
- if (nexpand_children > 0)
- extra = size / nexpand_children;
- else
- extra = 0;
- }
+ child_allocation.x = allocation->x;
+ child_allocation.width = MAX (1, allocation->width);
+ if (packing == GTK_PACK_START)
+ y = allocation->y;
+ else
+ y = allocation->y + allocation->height;
+ }
- /* Allocate child positions. */
+ for (i = 0, children = private->children;
+ children;
+ children = children->next)
+ {
+ child = children->data;
- for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
- {
- if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- child_allocation.y = allocation->y + border_width;
- child_allocation.height = MAX (1, allocation->height - border_width * 2);
- if (packing == GTK_PACK_START)
- x = allocation->x + border_width;
- else
- x = allocation->x + allocation->width - border_width;
- }
- else
- {
- child_allocation.x = allocation->x + border_width;
- child_allocation.width = MAX (1, allocation->width - border_width * 2);
- if (packing == GTK_PACK_START)
- y = allocation->y + border_width;
- else
- y = allocation->y + allocation->height - border_width;
- }
+ /* If widget is not visible, skip it. */
+ if (!gtk_widget_get_visible (child->widget))
+ continue;
- i = 0;
- children = private->children;
- while (children)
+ /* If widget is packed differently skip it, but still increment i,
+ * since widget is visible and will be handled in next loop iteration.
+ */
+ if (child->pack != packing)
{
- child = children->data;
- children = children->next;
-
- if (gtk_widget_get_visible (child->widget))
- {
- if (child->pack == packing)
- {
- /* Assign the child's size. */
- if (private->homogeneous)
- {
- if (nvis_children == 1)
- child_size = size;
- else
- child_size = extra;
-
- nvis_children -= 1;
- size -= extra;
- }
- else
- {
- child_size = sizes[i].minimum_size + child->padding * 2;
-
- if (child->expand)
- {
- if (nexpand_children == 1)
- child_size += size;
- else
- child_size += extra;
-
- nexpand_children -= 1;
- size -= extra;
- }
- }
-
- /* Assign the child's position. */
- if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- if (child->fill)
- {
- child_allocation.width = MAX (1, child_size - child->padding * 2);
- child_allocation.x = x + child->padding;
- }
- else
- {
- child_allocation.width = sizes[i].minimum_size;
- child_allocation.x = x + (child_size - child_allocation.width) / 2;
- }
-
- if (packing == GTK_PACK_START)
- {
- x += child_size + private->spacing;
- }
- else
- {
- x -= child_size + private->spacing;
-
- child_allocation.x -= child_size;
- }
-
- if (direction == GTK_TEXT_DIR_RTL)
- child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
-
- }
- else /* (private->orientation == GTK_ORIENTATION_VERTICAL) */
- {
- if (child->fill)
- {
- child_allocation.height = MAX (1, child_size - child->padding * 2);
- child_allocation.y = y + child->padding;
- }
- else
- {
- child_allocation.height = sizes[i].minimum_size;
- child_allocation.y = y + (child_size - child_allocation.height) / 2;
- }
-
- if (packing == GTK_PACK_START)
- {
- y += child_size + private->spacing;
- }
- else
- {
- y -= child_size + private->spacing;
-
- child_allocation.y -= child_size;
- }
- }
- gtk_widget_size_allocate (child->widget, &child_allocation);
- }
-
- i += 1;
- }
+ i++;
+ continue;
+ }
+
+ /* Assign the child's size. */
+ if (private->homogeneous)
+ {
+ child_size = extra;
+
+ if (n_extra_widgets > 0)
+ {
+ child_size++;
+ n_extra_widgets--;
+ }
}
+ else
+ {
+ child_size = sizes[i].minimum_size + child->padding * 2;
+
+ if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
+ {
+ child_size += extra;
+
+ if (n_extra_widgets > 0)
+ {
+ child_size++;
+ n_extra_widgets--;
+ }
+ }
+ }
+
+ /* Assign the child's position. */
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ if (child->fill)
+ {
+ child_allocation.width = MAX (1, child_size - child->padding * 2);
+ child_allocation.x = x + child->padding;
+ }
+ else
+ {
+ child_allocation.width = sizes[i].minimum_size;
+ child_allocation.x = x + (child_size - child_allocation.width) / 2;
+ }
+
+ if (packing == GTK_PACK_START)
+ {
+ x += child_size + private->spacing;
+ }
+ else
+ {
+ x -= child_size + private->spacing;
+
+ child_allocation.x -= child_size;
+ }
+
+ if (direction == GTK_TEXT_DIR_RTL)
+ child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
+
+ }
+ else /* (private->orientation == GTK_ORIENTATION_VERTICAL) */
+ {
+ if (child->fill)
+ {
+ child_allocation.height = MAX (1, child_size - child->padding * 2);
+ child_allocation.y = y + child->padding;
+ }
+ else
+ {
+ child_allocation.height = sizes[i].minimum_size;
+ child_allocation.y = y + (child_size - child_allocation.height) / 2;
+ }
+
+ if (packing == GTK_PACK_START)
+ {
+ y += child_size + private->spacing;
+ }
+ else
+ {
+ y -= child_size + private->spacing;
+
+ child_allocation.y -= child_size;
+ }
+ }
+ gtk_widget_size_allocate (child->widget, &child_allocation);
+
+ i++;
}
}
}
+static void
+gtk_box_compute_expand (GtkWidget *widget,
+ gboolean *hexpand_p,
+ gboolean *vexpand_p)
+{
+ GtkBoxPrivate *private = GTK_BOX (widget)->priv;
+ GList *children;
+ GtkBoxChild *child;
+ gboolean our_expand;
+ gboolean opposite_expand;
+ GtkOrientation opposite_orientation;
+
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ opposite_orientation = GTK_ORIENTATION_VERTICAL;
+ else
+ opposite_orientation = GTK_ORIENTATION_HORIZONTAL;
+
+ our_expand = FALSE;
+ opposite_expand = FALSE;
+
+ for (children = private->children; children; children = children->next)
+ {
+ child = children->data;
+
+ /* we don't recurse into children anymore as soon as we know
+ * expand=TRUE in an orientation
+ */
+
+ if (child->expand || (!our_expand && gtk_widget_compute_expand (child->widget, private->orientation)))
+ our_expand = TRUE;
+
+ if (!opposite_expand && gtk_widget_compute_expand (child->widget, opposite_orientation))
+ opposite_expand = TRUE;
+
+ if (our_expand && opposite_expand)
+ break;
+ }
+
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ *hexpand_p = our_expand;
+ *vexpand_p = opposite_expand;
+ }
+ else
+ {
+ *hexpand_p = opposite_expand;
+ *vexpand_p = our_expand;
+ }
+}
+
static GType
gtk_box_child_type (GtkContainer *container)
{
guint padding,
GtkPackType pack_type)
{
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
GtkBoxChild *child_info;
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (GTK_IS_WIDGET (child));
- g_return_if_fail (child->parent == NULL);
+ g_return_if_fail (gtk_widget_get_parent (child) == NULL);
child_info = g_new (GtkBoxChild, 1);
child_info->widget = child;
}
-static void
-gtk_box_size_request_init (GtkSizeRequestIface *iface)
-{
- parent_size_request_iface = g_type_interface_peek_parent (iface);
-
- iface->get_request_mode = gtk_box_get_request_mode;
- iface->get_width = gtk_box_get_width;
- iface->get_height = gtk_box_get_height;
- iface->get_height_for_width = gtk_box_get_height_for_width;
- iface->get_width_for_height = gtk_box_get_width_for_height;
-}
-
static GtkSizeRequestMode
-gtk_box_get_request_mode (GtkSizeRequest *widget)
+gtk_box_get_request_mode (GtkWidget *widget)
{
- GtkBoxPriv *private = GTK_BOX (widget)->priv;
+ GtkBoxPrivate *private = GTK_BOX (widget)->priv;
return (private->orientation == GTK_ORIENTATION_VERTICAL) ?
GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH : GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
}
static void
-gtk_box_get_size (GtkSizeRequest *widget,
- GtkOrientation orientation,
- gint *minimum_size,
- gint *natural_size)
+gtk_box_get_size (GtkWidget *widget,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
{
GtkBox *box;
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
GList *children;
gint nvis_children;
- gint border_width;
gint minimum, natural;
box = GTK_BOX (widget);
private = box->priv;
- border_width = gtk_container_get_border_width (GTK_CONTAINER (box));
minimum = natural = 0;
gint child_minimum, child_natural;
if (orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_size_request_get_width (GTK_SIZE_REQUEST (child->widget),
- &child_minimum, &child_natural);
+ gtk_widget_get_preferred_width (child->widget,
+ &child_minimum, &child_natural);
else
- gtk_size_request_get_height (GTK_SIZE_REQUEST (child->widget),
- &child_minimum, &child_natural);
+ gtk_widget_get_preferred_height (child->widget,
+ &child_minimum, &child_natural);
if (private->orientation == orientation)
{
natural += (nvis_children - 1) * private->spacing;
}
- minimum += border_width * 2;
- natural += border_width * 2;
-
if (minimum_size)
*minimum_size = minimum;
}
static void
-gtk_box_get_width (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size)
+gtk_box_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
gtk_box_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
}
static void
-gtk_box_get_height (GtkSizeRequest *widget,
- gint *minimum_size,
- gint *natural_size)
+gtk_box_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
gtk_box_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
}
gint *minimum_size,
gint *natural_size)
{
- GtkBoxPriv *private = box->priv;
- GtkBoxChild *child;
- GList *children;
- gint nvis_children;
- gint nexpand_children;
- gint computed_minimum = 0, computed_natural = 0;
- guint border_width = gtk_container_get_border_width (GTK_CONTAINER (box));
+ GtkBoxPrivate *private = box->priv;
+ GtkBoxChild *child;
+ GList *children;
+ gint nvis_children;
+ gint nexpand_children;
+ gint computed_minimum = 0, computed_natural = 0;
+ GtkRequestedSize *sizes;
+ GtkPackType packing;
+ gint size, extra, i;
+ gint child_size, child_minimum, child_natural;
+ gint n_extra_widgets = 0;
count_expand_children (box, &nvis_children, &nexpand_children);
- if (nvis_children > 0)
- {
- GtkRequestedSize *sizes = g_newa (GtkRequestedSize, nvis_children);
- GtkPackType packing;
- gint size, extra, i;
- gint child_size, child_minimum, child_natural;
+ if (nvis_children <= 0)
+ return;
- size = avail_size - border_width * 2 - (nvis_children - 1) * private->spacing;
+ sizes = g_newa (GtkRequestedSize, nvis_children);
+ size = avail_size - (nvis_children - 1) * private->spacing;
- /* Retrieve desired size for visible children */
- for (i = 0, children = private->children; children; children = children->next)
- {
- child = children->data;
+ /* Retrieve desired size for visible children */
+ for (i = 0, children = private->children; children; children = children->next)
+ {
+ child = children->data;
- if (gtk_widget_get_visible (child->widget))
- {
- if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_size_request_get_width (GTK_SIZE_REQUEST (child->widget),
- &sizes[i].minimum_size,
- &sizes[i].natural_size);
- else
- gtk_size_request_get_height (GTK_SIZE_REQUEST (child->widget),
- &sizes[i].minimum_size,
- &sizes[i].natural_size);
-
- /* Assert the api is working properly */
- if (sizes[i].minimum_size < 0)
- g_error ("GtkBox child %s minimum %s: %d < 0",
- gtk_widget_get_name (GTK_WIDGET (child->widget)),
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
- sizes[i].minimum_size);
-
- if (sizes[i].natural_size < sizes[i].minimum_size)
- g_error ("GtkBox child %s natural %s: %d < minimum %d",
- gtk_widget_get_name (GTK_WIDGET (child->widget)),
- (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
- sizes[i].natural_size,
- sizes[i].minimum_size);
-
- size -= sizes[i].minimum_size;
- size -= child->padding * 2;
-
- sizes[i].data = child;
-
- i += 1;
- }
+ if (gtk_widget_get_visible (child->widget))
+ {
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_get_preferred_width (child->widget,
+ &sizes[i].minimum_size,
+ &sizes[i].natural_size);
+ else
+ gtk_widget_get_preferred_height (child->widget,
+ &sizes[i].minimum_size,
+ &sizes[i].natural_size);
+
+ /* Assert the api is working properly */
+ if (sizes[i].minimum_size < 0)
+ g_error ("GtkBox child %s minimum %s: %d < 0",
+ gtk_widget_get_name (GTK_WIDGET (child->widget)),
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
+ sizes[i].minimum_size);
+
+ if (sizes[i].natural_size < sizes[i].minimum_size)
+ g_error ("GtkBox child %s natural %s: %d < minimum %d",
+ gtk_widget_get_name (GTK_WIDGET (child->widget)),
+ (private->orientation == GTK_ORIENTATION_HORIZONTAL) ? "width" : "height",
+ sizes[i].natural_size,
+ sizes[i].minimum_size);
+
+ size -= sizes[i].minimum_size;
+ size -= child->padding * 2;
+
+ sizes[i].data = child;
+
+ i += 1;
}
+ }
- if (private->homogeneous)
+ if (private->homogeneous)
+ {
+ /* If were homogenous we still need to run the above loop to get the
+ * minimum sizes for children that are not going to fill
+ */
+ size = avail_size - (nvis_children - 1) * private->spacing;
+ extra = size / nvis_children;
+ n_extra_widgets = size % nvis_children;
+ }
+ else
+ {
+ /* Bring children up to size first */
+ size = gtk_distribute_natural_allocation (MAX (0, size), nvis_children, sizes);
+
+ /* Calculate space which hasn't distributed yet,
+ * and is available for expanding children.
+ */
+ if (nexpand_children > 0)
{
- /* If were homogenous we still need to run the above loop to get the minimum sizes
- * for children that are not going to fill
- */
- size = avail_size - border_width * 2 - (nvis_children - 1) * private->spacing;
- extra = size / nvis_children;
- }
+ extra = size / nexpand_children;
+ n_extra_widgets = size % nexpand_children;
+ }
else
+ extra = 0;
+ }
+
+ /* Allocate child positions. */
+ for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
+ {
+ for (i = 0, children = private->children;
+ children;
+ children = children->next)
{
- /* Bring children up to size first */
- size = gtk_distribute_natural_allocation (size, nvis_children, sizes);
-
- /* Calculate space which hasn't distributed yet,
- * and is available for expanding children.
- */
- if (nexpand_children > 0)
- extra = size / nexpand_children;
- else
- extra = 0;
- }
+ child = children->data;
- /* Allocate child positions. */
- for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
- {
- for (i = 0, children = private->children; children; children = children->next)
+ /* If widget is not visible, skip it. */
+ if (!gtk_widget_get_visible (child->widget))
+ continue;
+
+ /* If widget is packed differently skip it, but still increment i,
+ * since widget is visible and will be handled in next loop iteration.
+ */
+ if (child->pack != packing)
{
- child = children->data;
-
- if (gtk_widget_get_visible (child->widget))
- {
- if (child->pack == packing)
- {
- /* Assign the child's size. */
- if (private->homogeneous)
- {
- if (nvis_children == 1)
- child_size = size;
- else
- child_size = extra;
-
- nvis_children -= 1;
- size -= extra;
- }
- else
- {
- child_size = sizes[i].minimum_size + child->padding * 2;
-
- if (child->expand)
- {
- if (nexpand_children == 1)
- child_size += size;
- else
- child_size += extra;
-
- nexpand_children -= 1;
- size -= extra;
- }
- }
-
- if (child->fill)
- {
- child_size = MAX (1, child_size - child->padding * 2);
- }
- else
+ i++;
+ continue;
+ }
+
+ if (child->pack == packing)
+ {
+ /* Assign the child's size. */
+ if (private->homogeneous)
+ {
+ child_size = extra;
+
+ if (n_extra_widgets > 0)
+ {
+ child_size++;
+ n_extra_widgets--;
+ }
+ }
+ else
+ {
+ child_size = sizes[i].minimum_size + child->padding * 2;
+
+ if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
+ {
+ child_size += extra;
+
+ if (n_extra_widgets > 0)
{
- child_size = sizes[i].minimum_size;
+ child_size++;
+ n_extra_widgets--;
}
+ }
+ }
+ if (child->fill)
+ {
+ child_size = MAX (1, child_size - child->padding * 2);
+ }
+ else
+ {
+ child_size = sizes[i].minimum_size;
+ }
- /* Assign the child's position. */
- if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_size_request_get_height_for_width (GTK_SIZE_REQUEST (child->widget),
- child_size, &child_minimum, &child_natural);
- else /* (private->orientation == GTK_ORIENTATION_VERTICAL) */
- gtk_size_request_get_width_for_height (GTK_SIZE_REQUEST (child->widget),
- child_size, &child_minimum, &child_natural);
-
- computed_minimum = MAX (computed_minimum, child_minimum);
- computed_natural = MAX (computed_natural, child_natural);
- }
- i += 1;
- }
+ /* Assign the child's position. */
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_get_preferred_height_for_width (child->widget,
+ child_size, &child_minimum, &child_natural);
+ else /* (private->orientation == GTK_ORIENTATION_VERTICAL) */
+ gtk_widget_get_preferred_width_for_height (child->widget,
+ child_size, &child_minimum, &child_natural);
+
+
+ computed_minimum = MAX (computed_minimum, child_minimum);
+ computed_natural = MAX (computed_natural, child_natural);
}
+ i += 1;
}
}
- computed_minimum += border_width * 2;
- computed_natural += border_width * 2;
-
if (minimum_size)
*minimum_size = computed_minimum;
if (natural_size)
*natural_size = computed_natural;
-}
+}
-static void
+static void
gtk_box_compute_size_for_orientation (GtkBox *box,
gint avail_size,
gint *minimum_size,
gint *natural_size)
{
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
GList *children;
gint nvis_children = 0;
gint required_size = 0, required_natural = 0, child_size, child_natural;
gint largest_child = 0, largest_natural = 0;
- guint border_width;
-
- border_width = gtk_container_get_border_width (GTK_CONTAINER (box));
- avail_size -= border_width * 2;
- for (children = private->children; children != NULL;
+ for (children = private->children; children != NULL;
children = children->next, nvis_children++)
{
GtkBoxChild *child = children->data;
{
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_size_request_get_width_for_height (GTK_SIZE_REQUEST (child->widget),
- avail_size, &child_size, &child_natural);
+ gtk_widget_get_preferred_width_for_height (child->widget,
+ avail_size, &child_size, &child_natural);
else
- gtk_size_request_get_height_for_width (GTK_SIZE_REQUEST (child->widget),
- avail_size, &child_size, &child_natural);
+ gtk_widget_get_preferred_height_for_width (child->widget,
+ avail_size, &child_size, &child_natural);
child_size += child->padding * 2;
required_natural += (nvis_children - 1) * private->spacing;
}
- required_size += border_width * 2;
- required_natural += border_width * 2;
-
if (minimum_size)
*minimum_size = required_size;
*natural_size = required_natural;
}
-static void
-gtk_box_get_width_for_height (GtkSizeRequest *widget,
- gint height,
- gint *minimum_width,
- gint *natural_width)
+static void
+gtk_box_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width)
{
GtkBox *box = GTK_BOX (widget);
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
if (private->orientation == GTK_ORIENTATION_VERTICAL)
- gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width);
+ gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width);
else
gtk_box_compute_size_for_orientation (box, height, minimum_width, natural_width);
}
-static void
-gtk_box_get_height_for_width (GtkSizeRequest *widget,
- gint width,
- gint *minimum_height,
- gint *natural_height)
+static void
+gtk_box_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height)
{
GtkBox *box = GTK_BOX (widget);
- GtkBoxPriv *private = box->priv;
+ GtkBoxPrivate *private = box->priv;
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_box_compute_size_for_opposing_orientation (box, width, minimum_height, natural_height);
/**
* gtk_box_new:
* @orientation: the box' orientation.
- * @homogeneous: %TRUE if all children are to be given equal space allocations.
* @spacing: the number of pixels to place by default between children.
*
* Creates a new #GtkBox.
**/
GtkWidget*
gtk_box_new (GtkOrientation orientation,
- gboolean homogeneous,
gint spacing)
{
return g_object_new (GTK_TYPE_BOX,
"orientation", orientation,
"spacing", spacing,
- "homogeneous", homogeneous ? TRUE : FALSE,
NULL);
}
* gtk_box_pack_start:
* @box: a #GtkBox
* @child: the #GtkWidget to be added to @box
- * @expand: %TRUE if the new child is to be given extra space allocated to
- * @box. The extra space will be divided evenly between all children of
- * @box that use this option
+ * @expand: %TRUE if the new child is to be given extra space allocated
+ * to @box. The extra space will be divided evenly between all children
+ * that use this option
* @fill: %TRUE if space given to @child by the @expand option is
- * actually allocated to @child, rather than just padding it. This
- * parameter has no effect if @expand is set to %FALSE. A child is
- * always allocated the full height of a #GtkHBox and the full width
- * of a #GtkVBox. This option affects the other dimension
+ * actually allocated to @child, rather than just padding it. This
+ * parameter has no effect if @expand is set to %FALSE. A child is
+ * always allocated the full height of a #GtkHBox and the full width
+ * of a #GtkVBox. This option affects the other dimension
* @padding: extra space in pixels to put between this child and its
* neighbors, over and above the global amount specified by
- * #GtkBox:spacing property. If @child is a widget at one of the
- * reference ends of @box, then @padding pixels are also put between
+ * #GtkBox:spacing property. If @child is a widget at one of the
+ * reference ends of @box, then @padding pixels are also put between
* @child and the reference edge of @box
*
* Adds @child to @box, packed with reference to the start of @box.
- * The @child is packed after any other child packed with reference
+ * The @child is packed after any other child packed with reference
* to the start of @box.
*/
void
gtk_box_set_homogeneous (GtkBox *box,
gboolean homogeneous)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
g_return_if_fail (GTK_IS_BOX (box));
gtk_box_set_spacing (GtkBox *box,
gint spacing)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
g_return_if_fail (GTK_IS_BOX (box));
_gtk_box_set_spacing_set (GtkBox *box,
gboolean spacing_set)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
g_return_if_fail (GTK_IS_BOX (box));
gboolean
_gtk_box_get_spacing_set (GtkBox *box)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
GtkWidget *child,
gint position)
{
- GtkBoxPriv *priv;
+ GtkBoxPrivate *priv;
GList *old_link;
GList *new_link;
GtkBoxChild *child_info = NULL;
guint *padding,
GtkPackType *pack_type)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
GList *list;
GtkBoxChild *child_info = NULL;
guint padding,
GtkPackType pack_type)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
GList *list;
GtkBoxChild *child_info = NULL;
gtk_widget_freeze_child_notify (child);
if (list)
{
- child_info->expand = expand != FALSE;
- gtk_widget_child_notify (child, "expand");
+ gboolean expanded;
+
+ expanded = expand != FALSE;
+
+ /* avoid setting expand if unchanged, since queue_compute_expand
+ * can be expensive-ish
+ */
+ if (child_info->expand != expanded)
+ {
+ child_info->expand = expand != FALSE;
+ gtk_widget_queue_compute_expand (GTK_WIDGET (box));
+ gtk_widget_child_notify (child, "expand");
+ }
+
child_info->fill = fill != FALSE;
gtk_widget_child_notify (child, "fill");
child_info->padding = padding;
void
_gtk_box_set_old_defaults (GtkBox *box)
{
- GtkBoxPriv *private;
+ GtkBoxPrivate *private;
g_return_if_fail (GTK_IS_BOX (box));
gtk_box_add (GtkContainer *container,
GtkWidget *widget)
{
- GtkBoxPriv *priv = GTK_BOX (container)->priv;
+ GtkBoxPrivate *priv = GTK_BOX (container)->priv;
gtk_box_pack_start (GTK_BOX (container), widget,
priv->default_expand,
GtkWidget *widget)
{
GtkBox *box = GTK_BOX (container);
- GtkBoxPriv *priv = box->priv;
+ GtkBoxPrivate *priv = box->priv;
GtkBoxChild *child;
GList *children;
gpointer callback_data)
{
GtkBox *box = GTK_BOX (container);
- GtkBoxPriv *priv = box->priv;
+ GtkBoxPrivate *priv = box->priv;
GtkBoxChild *child;
GList *children;
GList *
_gtk_box_get_children (GtkBox *box)
{
- GtkBoxPriv *priv;
+ GtkBoxPrivate *priv;
GtkBoxChild *child;
GList *children;
GList *retval = NULL;
projects / ~andy / gtk / blobdiff