* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+/**
+ * SECTION:gtkbox
+ * @Short_description: Base class for box containers
+ * @Title: GtkBox
+ * @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
+ * widgets into a rectangular area. GtkBox has a number of derived
+ * classes, e.g. #GtkHBox and #GtkVBox.
+ *
+ * The rectangular area of a GtkBox is organized into either a single row
+ * or a single column of child widgets depending upon whether the box is
+ * of type #GtkHBox or #GtkVBox, respectively. Thus, all children of a
+ * GtkBox are allocated one dimension in common, which is the height of a
+ * row, or the width of a column.
+ *
+ * GtkBox uses a notion of <emphasis>packing</emphasis>. Packing
+ * refers to adding widgets with reference to a particular position in a
+ * #GtkContainer. For a GtkBox, there are two reference positions: the
+ * <emphasis>start</emphasis> and the <emphasis>end</emphasis> of the box.
+ * For a #GtkVBox, the start is defined as the top of the box and the end is
+ * defined as the bottom. For a #GtkHBox the start is defined as the
+ * left side and the end is defined as the right side.
+ *
+ * Use repeated calls to gtk_box_pack_start() to pack widgets into a
+ * GtkBox from start to end. Use gtk_box_pack_end() to add widgets from
+ * end to start. You may intersperse these calls and add widgets from
+ * both ends of the same GtkBox.
+ *
+ * Because GtkBox is a #GtkContainer, you may also use
+ * gtk_container_add() to insert widgets into the box, and they will be
+ * packed with the default values for #GtkBox:expand and #GtkBox:fill.
+ * Use gtk_container_remove() to remove widgets from the GtkBox.
+ *
+ * Use gtk_box_set_homogeneous() to specify whether or not all children
+ * 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. 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"
+
enum {
PROP_0,
+ PROP_ORIENTATION,
PROP_SPACING,
PROP_HOMOGENEOUS
};
CHILD_PROP_POSITION
};
-static void gtk_box_class_init (GtkBoxClass *klass);
-static void gtk_box_init (GtkBox *box);
-static void gtk_box_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_box_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void gtk_box_map (GtkWidget *widget);
-static void gtk_box_unmap (GtkWidget *widget);
-static void gtk_box_add (GtkContainer *container,
- GtkWidget *widget);
-static void gtk_box_remove (GtkContainer *container,
- GtkWidget *widget);
-static void gtk_box_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data);
-static void gtk_box_set_child_property (GtkContainer *container,
- GtkWidget *child,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_box_get_child_property (GtkContainer *container,
- GtkWidget *child,
- guint property_id,
- GValue *value,
- GParamSpec *pspec);
-static GtkType gtk_box_child_type (GtkContainer *container);
-
-
-static GtkContainerClass *parent_class = NULL;
-
-
-GtkType
-gtk_box_get_type (void)
-{
- static GtkType box_type = 0;
-
- if (!box_type)
- {
- static const GtkTypeInfo box_info =
- {
- "GtkBox",
- sizeof (GtkBox),
- sizeof (GtkBoxClass),
- (GtkClassInitFunc) gtk_box_class_init,
- (GtkObjectInitFunc) gtk_box_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- box_type = gtk_type_unique (GTK_TYPE_CONTAINER, &box_info);
- }
+struct _GtkBoxPrivate
+{
+ GtkOrientation orientation;
- return box_type;
-}
+ GList *children;
+
+ gint16 spacing;
+
+ guint default_expand : 1;
+ guint homogeneous : 1;
+ guint spacing_set : 1;
+};
+
+typedef struct _GtkBoxChild GtkBoxChild;
+
+/*
+ * GtkBoxChild:
+ * @widget: the child widget, packed into the GtkBox.
+ * @padding: the number of extra pixels to put between this child and its
+ * neighbors, set when packed, zero by default.
+ * @expand: flag indicates whether extra space should be given to this child.
+ * Any extra space given to the parent GtkBox is divided up among all children
+ * with this attribute set to %TRUE; set when packed, %TRUE by default.
+ * @fill: flag indicates whether any extra space given to this child due to its
+ * @expand attribute being set is actually allocated to the child, rather than
+ * being used as padding around the widget; set when packed, %TRUE by default.
+ * @pack: one of #GtkPackType indicating whether the child is packed with
+ * reference to the start (top/left) or end (bottom/right) of the GtkBox.
+ */
+struct _GtkBoxChild
+{
+ GtkWidget *widget;
+
+ guint16 padding;
+
+ guint expand : 1;
+ guint fill : 1;
+ guint pack : 1;
+};
+
+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,
+ GParamSpec *pspec);
+static void gtk_box_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_box_add (GtkContainer *container,
+ GtkWidget *widget);
+static void gtk_box_remove (GtkContainer *container,
+ GtkWidget *widget);
+static void gtk_box_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
+static void gtk_box_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_box_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static GType gtk_box_child_type (GtkContainer *container);
+
+
+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))
static void
gtk_box_class_init (GtkBoxClass *class)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class->set_property = gtk_box_set_property;
+ object_class->get_property = gtk_box_get_property;
- gobject_class->set_property = gtk_box_set_property;
- gobject_class->get_property = gtk_box_get_property;
-
- widget_class->map = gtk_box_map;
- widget_class->unmap = gtk_box_unmap;
+ 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,
+ "orientation");
- g_object_class_install_property (gobject_class,
+ g_object_class_install_property (object_class,
PROP_SPACING,
g_param_spec_int ("spacing",
- _("Spacing"),
- _("The amount of space between children."),
+ P_("Spacing"),
+ P_("The amount of space between children"),
0,
G_MAXINT,
0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
-
- g_object_class_install_property (gobject_class,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
PROP_HOMOGENEOUS,
g_param_spec_boolean ("homogeneous",
- _("Homogeneous"),
- _("Whether the children should all be the same size."),
+ P_("Homogeneous"),
+ P_("Whether the children should all be the same size"),
FALSE,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
-
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkBox:expand:
+ *
+ * Whether the child should receive extra space when the parent grows.
+ *
+ * Note that the default value for this property is %FALSE for GtkBox,
+ * but #GtkHBox, #GtkVBox and other subclasses use the old default
+ * of %TRUE.
+ */
gtk_container_class_install_child_property (container_class,
CHILD_PROP_EXPAND,
- g_param_spec_boolean ("expand", NULL, NULL,
- TRUE,
- G_PARAM_READWRITE));
+ g_param_spec_boolean ("expand",
+ P_("Expand"),
+ P_("Whether the child should receive extra space when the parent grows"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkBox:fill:
+ *
+ * Whether the child should receive extra space when the parent grows.
+ *
+ * Note that the default value for this property is %FALSE for GtkBox,
+ * but #GtkHBox, #GtkVBox and other subclasses use the old default
+ * of %TRUE.
+ */
gtk_container_class_install_child_property (container_class,
CHILD_PROP_FILL,
- g_param_spec_boolean ("fill", NULL, NULL,
- TRUE,
- G_PARAM_READWRITE));
+ g_param_spec_boolean ("fill",
+ P_("Fill"),
+ P_("Whether extra space given to the child should be allocated to the child or used as padding"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
gtk_container_class_install_child_property (container_class,
CHILD_PROP_PADDING,
- g_param_spec_uint ("padding", NULL, NULL,
+ g_param_spec_uint ("padding",
+ P_("Padding"),
+ P_("Extra space to put between the child and its neighbors, in pixels"),
0, G_MAXINT, 0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
CHILD_PROP_PACK_TYPE,
- g_param_spec_enum ("pack_type", NULL, NULL,
+ g_param_spec_enum ("pack-type",
+ P_("Pack type"),
+ P_("A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"),
GTK_TYPE_PACK_TYPE, GTK_PACK_START,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
CHILD_PROP_POSITION,
- g_param_spec_int ("position", NULL, NULL,
+ g_param_spec_int ("position",
+ P_("Position"),
+ P_("The index of the child in the parent"),
-1, G_MAXINT, 0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
+
+ g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
}
static void
gtk_box_init (GtkBox *box)
{
- GTK_WIDGET_SET_FLAGS (box, GTK_NO_WINDOW);
+ GtkBoxPrivate *private;
+
+ box->priv = G_TYPE_INSTANCE_GET_PRIVATE (box,
+ GTK_TYPE_BOX,
+ GtkBoxPrivate);
+ private = box->priv;
- box->children = NULL;
- box->spacing = 0;
- box->homogeneous = FALSE;
+ gtk_widget_set_has_window (GTK_WIDGET (box), FALSE);
+ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), FALSE);
+
+ private->orientation = GTK_ORIENTATION_HORIZONTAL;
+ private->children = NULL;
+
+ private->default_expand = FALSE;
+ private->homogeneous = FALSE;
+ private->spacing = 0;
+ private->spacing_set = FALSE;
}
-static void
-gtk_box_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+static void
+gtk_box_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- GtkBox *box;
-
- box = GTK_BOX (object);
+ GtkBox *box = GTK_BOX (object);
+ GtkBoxPrivate *private = box->priv;
switch (prop_id)
{
+ case PROP_ORIENTATION:
+ private->orientation = g_value_get_enum (value);
+ gtk_widget_queue_resize (GTK_WIDGET (box));
+ break;
case PROP_SPACING:
gtk_box_set_spacing (box, g_value_get_int (value));
break;
}
}
-static void gtk_box_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+static void
+gtk_box_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- GtkBox *box;
-
- box = GTK_BOX (object);
+ GtkBox *box = GTK_BOX (object);
+ GtkBoxPrivate *private = box->priv;
switch (prop_id)
{
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, private->orientation);
+ break;
case PROP_SPACING:
- g_value_set_int (value, box->spacing);
+ g_value_set_int (value, private->spacing);
break;
case PROP_HOMOGENEOUS:
- g_value_set_boolean (value, box->homogeneous);
+ g_value_set_boolean (value, private->homogeneous);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
-static GtkType
-gtk_box_child_type (GtkContainer *container)
+
+static void
+count_expand_children (GtkBox *box,
+ gint *visible_children,
+ gint *expand_children)
+{
+ GtkBoxPrivate *private = box->priv;
+ GList *children;
+ GtkBoxChild *child;
+
+ *visible_children = *expand_children = 0;
+
+ for (children = private->children; children; children = children->next)
+ {
+ child = children->data;
+
+ if (gtk_widget_get_visible (child->widget))
+ {
+ *visible_children += 1;
+ if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
+ *expand_children += 1;
+ }
+ }
+}
+
+static void
+gtk_box_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkBox *box = GTK_BOX (widget);
+ GtkBoxPrivate *private = box->priv;
+ GtkBoxChild *child;
+ GList *children;
+ gint nvis_children;
+ gint nexpand_children;
+
+ 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 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)
+ {
+ child = children->data;
+
+ if (!gtk_widget_get_visible (child->widget))
+ continue;
+
+ 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 - (nvis_children - 1) * private->spacing;
+ else
+ size = allocation->height - (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)
+ {
+ 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)
+ {
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ child_allocation.y = allocation->y;
+ child_allocation.height = MAX (1, allocation->height);
+ if (packing == GTK_PACK_START)
+ x = allocation->x;
+ else
+ x = allocation->x + allocation->width;
+ }
+ else
+ {
+ 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;
+ }
+
+ for (i = 0, children = private->children;
+ children;
+ children = children->next)
+ {
+ child = children->data;
+
+ /* 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)
+ {
+ 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)
{
return GTK_TYPE_WIDGET;
}
static void
-gtk_box_set_child_property (GtkContainer *container,
- GtkWidget *child,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+gtk_box_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
gboolean expand = 0;
gboolean fill = 0;
GValue *value,
GParamSpec *pspec)
{
- gboolean expand = 0;
- gboolean fill = 0;
+ gboolean expand = FALSE;
+ gboolean fill = FALSE;
guint padding = 0;
GtkPackType pack_type = 0;
GList *list;
break;
case CHILD_PROP_POSITION:
i = 0;
- for (list = GTK_BOX (container)->children; list; list = list->next)
+ for (list = GTK_BOX (container)->priv->children; list; list = list->next)
{
GtkBoxChild *child_entry;
}
}
-void
-gtk_box_pack_start (GtkBox *box,
- GtkWidget *child,
- gboolean expand,
- gboolean fill,
- guint padding)
+static void
+gtk_box_pack (GtkBox *box,
+ GtkWidget *child,
+ gboolean expand,
+ gboolean fill,
+ guint padding,
+ GtkPackType pack_type)
{
+ GtkBoxPrivate *private = box->priv;
GtkBoxChild *child_info;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
- g_return_if_fail (child->parent == NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
+ g_return_if_fail (gtk_widget_get_parent (child) == NULL);
child_info = g_new (GtkBoxChild, 1);
child_info->widget = child;
child_info->padding = padding;
child_info->expand = expand ? TRUE : FALSE;
child_info->fill = fill ? TRUE : FALSE;
- child_info->pack = GTK_PACK_START;
- child_info->is_secondary = FALSE;
+ child_info->pack = pack_type;
- box->children = g_list_append (box->children, child_info);
+ private->children = g_list_append (private->children, child_info);
gtk_widget_freeze_child_notify (child);
gtk_widget_set_parent (child, GTK_WIDGET (box));
- if (GTK_WIDGET_REALIZED (box))
- gtk_widget_realize (child);
-
- if (GTK_WIDGET_VISIBLE (box) && GTK_WIDGET_VISIBLE (child))
- {
- if (GTK_WIDGET_MAPPED (box))
- gtk_widget_map (child);
-
- gtk_widget_queue_resize (child);
- }
gtk_widget_child_notify (child, "expand");
gtk_widget_child_notify (child, "fill");
gtk_widget_child_notify (child, "padding");
- gtk_widget_child_notify (child, "pack_type");
+ gtk_widget_child_notify (child, "pack-type");
gtk_widget_child_notify (child, "position");
gtk_widget_thaw_child_notify (child);
}
-void
-gtk_box_pack_end (GtkBox *box,
- GtkWidget *child,
- gboolean expand,
- gboolean fill,
- guint padding)
+
+static GtkSizeRequestMode
+gtk_box_get_request_mode (GtkWidget *widget)
{
- GtkBoxChild *child_info;
+ GtkBoxPrivate *private = GTK_BOX (widget)->priv;
- g_return_if_fail (box != NULL);
- g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
- g_return_if_fail (child->parent == NULL);
+ return (private->orientation == GTK_ORIENTATION_VERTICAL) ?
+ GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH : GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
+}
- child_info = g_new (GtkBoxChild, 1);
- child_info->widget = child;
- child_info->padding = padding;
- child_info->expand = expand ? TRUE : FALSE;
- child_info->fill = fill ? TRUE : FALSE;
- child_info->pack = GTK_PACK_END;
- child_info->is_secondary = FALSE;
+static void
+gtk_box_get_size (GtkWidget *widget,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkBox *box;
+ GtkBoxPrivate *private;
+ GList *children;
+ gint nvis_children;
+ gint minimum, natural;
+
+ box = GTK_BOX (widget);
+ private = box->priv;
- box->children = g_list_append (box->children, child_info);
+ minimum = natural = 0;
- gtk_widget_freeze_child_notify (child);
+ nvis_children = 0;
- gtk_widget_set_parent (child, GTK_WIDGET (box));
+ for (children = private->children; children; children = children->next)
+ {
+ GtkBoxChild *child = children->data;
+
+ if (gtk_widget_get_visible (child->widget))
+ {
+ gint child_minimum, child_natural;
- if (GTK_WIDGET_REALIZED (box))
- gtk_widget_realize (child);
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_get_preferred_width (child->widget,
+ &child_minimum, &child_natural);
+ else
+ gtk_widget_get_preferred_height (child->widget,
+ &child_minimum, &child_natural);
+
+ if (private->orientation == orientation)
+ {
+ if (private->homogeneous)
+ {
+ gint largest;
+
+ largest = child_minimum + child->padding * 2;
+ minimum = MAX (minimum, largest);
+
+ largest = child_natural + child->padding * 2;
+ natural = MAX (natural, largest);
+ }
+ else
+ {
+ minimum += child_minimum + child->padding * 2;
+ natural += child_natural + child->padding * 2;
+ }
+ }
+ else
+ {
+ /* The biggest mins and naturals in the opposing orientation */
+ minimum = MAX (minimum, child_minimum);
+ natural = MAX (natural, child_natural);
+ }
+
+ nvis_children += 1;
+ }
+ }
- if (GTK_WIDGET_VISIBLE (box) && GTK_WIDGET_VISIBLE (child))
+ if (nvis_children > 0 && private->orientation == orientation)
{
- if (GTK_WIDGET_MAPPED (box))
- gtk_widget_map (child);
+ if (private->homogeneous)
+ {
+ minimum *= nvis_children;
+ natural *= nvis_children;
+ }
+ minimum += (nvis_children - 1) * private->spacing;
+ natural += (nvis_children - 1) * private->spacing;
+ }
+
+ if (minimum_size)
+ *minimum_size = minimum;
- gtk_widget_queue_resize (child);
+ if (natural_size)
+ *natural_size = natural;
+}
+
+static void
+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_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_box_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+}
+
+static void
+gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
+ gint avail_size,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ 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)
+ return;
+
+ 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;
+
+ 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;
+ }
}
- gtk_widget_child_notify (child, "expand");
- gtk_widget_child_notify (child, "fill");
- gtk_widget_child_notify (child, "padding");
- gtk_widget_child_notify (child, "pack_type");
- gtk_widget_child_notify (child, "position");
- gtk_widget_thaw_child_notify (child);
+
+ 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)
+ {
+ 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)
+ {
+ child = children->data;
+
+ /* 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)
+ {
+ 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++;
+ 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_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;
+ }
+ }
+
+ if (minimum_size)
+ *minimum_size = computed_minimum;
+ if (natural_size)
+ *natural_size = computed_natural;
}
-void
-gtk_box_pack_start_defaults (GtkBox *box,
- GtkWidget *child)
+static void
+gtk_box_compute_size_for_orientation (GtkBox *box,
+ gint avail_size,
+ gint *minimum_size,
+ gint *natural_size)
{
- g_return_if_fail (box != NULL);
- g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ 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;
+
+ for (children = private->children; children != NULL;
+ children = children->next, nvis_children++)
+ {
+ GtkBoxChild *child = children->data;
+
+ if (gtk_widget_get_visible (child->widget))
+ {
+
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_get_preferred_width_for_height (child->widget,
+ avail_size, &child_size, &child_natural);
+ else
+ gtk_widget_get_preferred_height_for_width (child->widget,
+ avail_size, &child_size, &child_natural);
+
+
+ child_size += child->padding * 2;
+ child_natural += child->padding * 2;
+
+ if (child_size > largest_child)
+ largest_child = child_size;
+
+ if (child_natural > largest_natural)
+ largest_natural = child_natural;
+
+ required_size += child_size;
+ required_natural += child_natural;
+ }
+ }
+
+ if (nvis_children > 0)
+ {
+ if (private->homogeneous)
+ {
+ required_size = largest_child * nvis_children;
+ required_natural = largest_natural * nvis_children;
+ }
+
+ required_size += (nvis_children - 1) * private->spacing;
+ required_natural += (nvis_children - 1) * private->spacing;
+ }
+
+ if (minimum_size)
+ *minimum_size = required_size;
+
+ if (natural_size)
+ *natural_size = required_natural;
+}
+
+static void
+gtk_box_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width)
+{
+ GtkBox *box = GTK_BOX (widget);
+ GtkBoxPrivate *private = box->priv;
+
+ if (private->orientation == GTK_ORIENTATION_VERTICAL)
+ 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_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height)
+{
+ GtkBox *box = GTK_BOX (widget);
+ GtkBoxPrivate *private = box->priv;
- gtk_box_pack_start (box, child, TRUE, TRUE, 0);
+ if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_box_compute_size_for_opposing_orientation (box, width, minimum_height, natural_height);
+ else
+ gtk_box_compute_size_for_orientation (box, width, minimum_height, natural_height);
}
+/**
+ * gtk_box_new:
+ * @orientation: the box' orientation.
+ * @spacing: the number of pixels to place by default between children.
+ *
+ * Creates a new #GtkBox.
+ *
+ * Return value: a new #GtkBox.
+ *
+ * Since: 3.0
+ **/
+GtkWidget*
+gtk_box_new (GtkOrientation orientation,
+ gint spacing)
+{
+ return g_object_new (GTK_TYPE_BOX,
+ "orientation", orientation,
+ "spacing", spacing,
+ 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
+ * 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
+ * @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
+ * @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
+ * to the start of @box.
+ */
void
-gtk_box_pack_end_defaults (GtkBox *box,
- GtkWidget *child)
+gtk_box_pack_start (GtkBox *box,
+ GtkWidget *child,
+ gboolean expand,
+ gboolean fill,
+ guint padding)
{
- g_return_if_fail (box != NULL);
- g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ gtk_box_pack (box, child, expand, fill, padding, GTK_PACK_START);
+}
- gtk_box_pack_end (box, child, TRUE, TRUE, 0);
+/**
+ * gtk_box_pack_end:
+ * @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
+ * @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
+ * @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
+ * @child and the reference edge of @box
+ *
+ * Adds @child to @box, packed with reference to the end of @box.
+ * The @child is packed after (away from end of) any other child
+ * packed with reference to the end of @box.
+ */
+void
+gtk_box_pack_end (GtkBox *box,
+ GtkWidget *child,
+ gboolean expand,
+ gboolean fill,
+ guint padding)
+{
+ gtk_box_pack (box, child, expand, fill, padding, GTK_PACK_END);
}
+/**
+ * gtk_box_set_homogeneous:
+ * @box: a #GtkBox
+ * @homogeneous: a boolean value, %TRUE to create equal allotments,
+ * %FALSE for variable allotments
+ *
+ * Sets the #GtkBox:homogeneous property of @box, controlling
+ * whether or not all children of @box are given equal space
+ * in the box.
+ */
void
gtk_box_set_homogeneous (GtkBox *box,
gboolean homogeneous)
{
- g_return_if_fail (box != NULL);
+ GtkBoxPrivate *private;
+
g_return_if_fail (GTK_IS_BOX (box));
- if ((homogeneous ? TRUE : FALSE) != box->homogeneous)
+ private = box->priv;
+
+ if ((homogeneous ? TRUE : FALSE) != private->homogeneous)
{
- box->homogeneous = homogeneous ? TRUE : FALSE;
+ private->homogeneous = homogeneous ? TRUE : FALSE;
g_object_notify (G_OBJECT (box), "homogeneous");
gtk_widget_queue_resize (GTK_WIDGET (box));
}
* @box: a #GtkBox
*
* Returns whether the box is homogeneous (all children are the
- * same size). See gtk_box_set_homogeneous ().
+ * same size). See gtk_box_set_homogeneous().
*
* Return value: %TRUE if the box is homogeneous.
**/
{
g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
- return box->homogeneous;
+ return box->priv->homogeneous;
}
+/**
+ * gtk_box_set_spacing:
+ * @box: a #GtkBox
+ * @spacing: the number of pixels to put between children
+ *
+ * Sets the #GtkBox:spacing property of @box, which is the
+ * number of pixels to place between children of @box.
+ */
void
gtk_box_set_spacing (GtkBox *box,
gint spacing)
{
- g_return_if_fail (box != NULL);
+ GtkBoxPrivate *private;
+
g_return_if_fail (GTK_IS_BOX (box));
- if (spacing != box->spacing)
+ private = box->priv;
+
+ if (spacing != private->spacing)
{
- box->spacing = spacing;
+ private->spacing = spacing;
+ _gtk_box_set_spacing_set (box, TRUE);
+
g_object_notify (G_OBJECT (box), "spacing");
+
gtk_widget_queue_resize (GTK_WIDGET (box));
}
}
{
g_return_val_if_fail (GTK_IS_BOX (box), 0);
- return box->spacing;
+ return box->priv->spacing;
+}
+
+void
+_gtk_box_set_spacing_set (GtkBox *box,
+ gboolean spacing_set)
+{
+ GtkBoxPrivate *private;
+
+ g_return_if_fail (GTK_IS_BOX (box));
+
+ private = box->priv;
+
+ private->spacing_set = spacing_set ? TRUE : FALSE;
}
+gboolean
+_gtk_box_get_spacing_set (GtkBox *box)
+{
+ GtkBoxPrivate *private;
+
+ g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
+
+ private = box->priv;
+
+ return private->spacing_set;
+}
+
+/**
+ * gtk_box_reorder_child:
+ * @box: a #GtkBox
+ * @child: the #GtkWidget to move
+ * @position: the new position for @child in the list of children
+ * of @box, starting from 0. If negative, indicates the end of
+ * the list
+ *
+ * Moves @child to a new @position in the list of @box children.
+ * The list is the <structfield>children</structfield> field of
+ * #GtkBox-struct, and contains both widgets packed #GTK_PACK_START
+ * as well as widgets packed #GTK_PACK_END, in the order that these
+ * widgets were added to @box.
+ *
+ * A widget's position in the @box children list determines where
+ * the widget is packed into @box. A child widget at some position
+ * in the list will be packed just after all other widgets of the
+ * same packing type that appear earlier in the list.
+ */
void
gtk_box_reorder_child (GtkBox *box,
GtkWidget *child,
gint position)
{
- GList *list;
+ GtkBoxPrivate *priv;
+ GList *old_link;
+ GList *new_link;
+ GtkBoxChild *child_info = NULL;
+ gint old_position;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
- list = box->children;
- while (list)
- {
- GtkBoxChild *child_info;
+ priv = box->priv;
- child_info = list->data;
+ old_link = priv->children;
+ old_position = 0;
+ while (old_link)
+ {
+ child_info = old_link->data;
if (child_info->widget == child)
break;
- list = list->next;
+ old_link = old_link->next;
+ old_position++;
}
- if (list && box->children->next)
- {
- GList *tmp_list;
+ g_return_if_fail (old_link != NULL);
- if (list->next)
- list->next->prev = list->prev;
- if (list->prev)
- list->prev->next = list->next;
- else
- box->children = list->next;
+ if (position == old_position)
+ return;
- tmp_list = box->children;
- while (position && tmp_list->next)
- {
- position--;
- tmp_list = tmp_list->next;
- }
+ priv->children = g_list_delete_link (priv->children, old_link);
- if (position)
- {
- tmp_list->next = list;
- list->prev = tmp_list;
- list->next = NULL;
- }
- else
- {
- if (tmp_list->prev)
- tmp_list->prev->next = list;
- else
- box->children = list;
- list->prev = tmp_list->prev;
- tmp_list->prev = list;
- list->next = tmp_list;
- }
+ if (position < 0)
+ new_link = NULL;
+ else
+ new_link = g_list_nth (priv->children, position);
- gtk_widget_child_notify (child, "position");
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
- gtk_widget_queue_resize (child);
- }
+ priv->children = g_list_insert_before (priv->children, new_link, child_info);
+
+ gtk_widget_child_notify (child, "position");
+ if (gtk_widget_get_visible (child)
+ && gtk_widget_get_visible (GTK_WIDGET (box)))
+ gtk_widget_queue_resize (child);
}
+/**
+ * gtk_box_query_child_packing:
+ * @box: a #GtkBox
+ * @child: the #GtkWidget of the child to query
+ * @expand: pointer to return location for #GtkBox:expand child property
+ * @fill: pointer to return location for #GtkBox:fill child property
+ * @padding: pointer to return location for #GtkBox:padding child property
+ * @pack_type: pointer to return location for #GtkBox:pack-type child property
+ *
+ * Obtains information about how @child is packed into @box.
+ */
void
-gtk_box_query_child_packing (GtkBox *box,
- GtkWidget *child,
- gboolean *expand,
- gboolean *fill,
- guint *padding,
- GtkPackType *pack_type)
+gtk_box_query_child_packing (GtkBox *box,
+ GtkWidget *child,
+ gboolean *expand,
+ gboolean *fill,
+ guint *padding,
+ GtkPackType *pack_type)
{
+ GtkBoxPrivate *private;
GList *list;
GtkBoxChild *child_info = NULL;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
+
+ private = box->priv;
- list = box->children;
+ list = private->children;
while (list)
{
child_info = list->data;
}
}
+/**
+ * gtk_box_set_child_packing:
+ * @box: a #GtkBox
+ * @child: the #GtkWidget of the child to set
+ * @expand: the new value of the #GtkBox:expand child property
+ * @fill: the new value of the #GtkBox:fill child property
+ * @padding: the new value of the #GtkBox:padding child property
+ * @pack_type: the new value of the #GtkBox:pack-type child property
+ *
+ * Sets the way @child is packed into @box.
+ */
void
-gtk_box_set_child_packing (GtkBox *box,
- GtkWidget *child,
- gboolean expand,
- gboolean fill,
- guint padding,
- GtkPackType pack_type)
+gtk_box_set_child_packing (GtkBox *box,
+ GtkWidget *child,
+ gboolean expand,
+ gboolean fill,
+ guint padding,
+ GtkPackType pack_type)
{
+ GtkBoxPrivate *private;
GList *list;
GtkBoxChild *child_info = NULL;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
+
+ private = box->priv;
- list = box->children;
+ list = private->children;
while (list)
{
child_info = list->data;
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;
child_info->pack = GTK_PACK_END;
else
child_info->pack = GTK_PACK_START;
- gtk_widget_child_notify (child, "pack_type");
+ gtk_widget_child_notify (child, "pack-type");
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
+ if (gtk_widget_get_visible (child)
+ && gtk_widget_get_visible (GTK_WIDGET (box)))
gtk_widget_queue_resize (child);
}
gtk_widget_thaw_child_notify (child);
}
-static void
-gtk_box_map (GtkWidget *widget)
-{
- GtkBox *box;
- GtkBoxChild *child;
- GList *children;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_BOX (widget));
-
- box = GTK_BOX (widget);
- GTK_WIDGET_SET_FLAGS (box, GTK_MAPPED);
-
- children = box->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget) &&
- !GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_map (child->widget);
- }
-}
-
-static void
-gtk_box_unmap (GtkWidget *widget)
+void
+_gtk_box_set_old_defaults (GtkBox *box)
{
- GtkBox *box;
- GtkBoxChild *child;
- GList *children;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_BOX (widget));
+ GtkBoxPrivate *private;
- box = GTK_BOX (widget);
- GTK_WIDGET_UNSET_FLAGS (box, GTK_MAPPED);
+ g_return_if_fail (GTK_IS_BOX (box));
- children = box->children;
- while (children)
- {
- child = children->data;
- children = children->next;
+ private = box->priv;
- if (GTK_WIDGET_VISIBLE (child->widget) &&
- GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_unmap (child->widget);
- }
+ private->default_expand = TRUE;
}
static void
gtk_box_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_BOX (container));
- g_return_if_fail (widget != NULL);
+ GtkBoxPrivate *priv = GTK_BOX (container)->priv;
- gtk_box_pack_start_defaults (GTK_BOX (container), widget);
+ gtk_box_pack_start (GTK_BOX (container), widget,
+ priv->default_expand,
+ priv->default_expand,
+ 0);
}
static void
gtk_box_remove (GtkContainer *container,
GtkWidget *widget)
{
- GtkBox *box;
+ GtkBox *box = GTK_BOX (container);
+ GtkBoxPrivate *priv = box->priv;
GtkBoxChild *child;
GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_BOX (container));
- g_return_if_fail (widget != NULL);
-
- box = GTK_BOX (container);
-
- children = box->children;
+ children = priv->children;
while (children)
{
child = children->data;
{
gboolean was_visible;
- was_visible = GTK_WIDGET_VISIBLE (widget);
+ was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
- box->children = g_list_remove_link (box->children, children);
+ priv->children = g_list_remove_link (priv->children, children);
g_list_free (children);
g_free (child);
- /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
+ /* queue resize regardless of gtk_widget_get_visible (container),
* since that's what is needed by toplevels.
*/
if (was_visible)
GtkCallback callback,
gpointer callback_data)
{
- GtkBox *box;
+ GtkBox *box = GTK_BOX (container);
+ GtkBoxPrivate *priv = box->priv;
GtkBoxChild *child;
GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_BOX (container));
- g_return_if_fail (callback != NULL);
-
- box = GTK_BOX (container);
-
- children = box->children;
+ children = priv->children;
while (children)
{
child = children->data;
(* callback) (child->widget, callback_data);
}
- children = g_list_last (box->children);
+ children = g_list_last (priv->children);
while (children)
{
child = children->data;
(* callback) (child->widget, callback_data);
}
}
+
+GList *
+_gtk_box_get_children (GtkBox *box)
+{
+ GtkBoxPrivate *priv;
+ GtkBoxChild *child;
+ GList *children;
+ GList *retval = NULL;
+
+ g_return_val_if_fail (GTK_IS_BOX (box), NULL);
+
+ priv = box->priv;
+
+ children = priv->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ retval = g_list_prepend (retval, child->widget);
+ }
+
+ return g_list_reverse (retval);
+}
projects / ~andy / gtk / blobdiff