* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+#include "config.h"
+
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
#include "gtktable.h"
+
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-#include "gtkalias.h"
+
+
+/**
+ * SECTION:gtktable
+ * @Short_description: Pack widgets in regular patterns
+ * @Title: GtkTable
+ * @See_also: #GtkGrid
+ *
+ * The #GtkTable functions allow the programmer to arrange widgets in rows and
+ * columns, making it easy to align many widgets next to each other,
+ * horizontally and vertically.
+ *
+ * Tables are created with a call to gtk_table_new(), the size of which can
+ * later be changed with gtk_table_resize().
+ *
+ * Widgets can be added to a table using gtk_table_attach() or the more
+ * convenient (but slightly less flexible) gtk_table_attach_defaults().
+ *
+ * To alter the space next to a specific row, use gtk_table_set_row_spacing(),
+ * and for a column, gtk_table_set_col_spacing().
+ * The gaps between <emphasis>all</emphasis> rows or columns can be changed by
+ * calling gtk_table_set_row_spacings() or gtk_table_set_col_spacings()
+ * respectively. Note that spacing is added <emphasis>between</emphasis> the
+ * children, while padding added by gtk_table_attach() is added <emphasis>on
+ * either side</emphasis> of the widget it belongs to.
+ *
+ * gtk_table_set_homogeneous(), can be used to set whether all cells in the
+ * table will resize themselves to the size of the largest widget in the table.
+ *
+ * <note>
+ * #GtkTable has been deprecated. Use #GtkGrid instead. It provides the same
+ * capabilities as GtkTable for arranging widgets in a rectangular grid, but
+ * does support height-for-width geometry management.
+ * </note>
+ */
+
+
+struct _GtkTablePrivate
+{
+ GtkTableRowCol *cols;
+ GtkTableRowCol *rows;
+
+ GList *children;
+
+ guint16 column_spacing;
+ guint16 ncols;
+ guint16 nrows;
+ guint16 row_spacing;
+
+ guint homogeneous : 1;
+};
enum
{
};
-static void gtk_table_class_init (GtkTableClass *klass);
-static void gtk_table_init (GtkTable *table);
static void gtk_table_finalize (GObject *object);
-static void gtk_table_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+static void gtk_table_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_table_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
static void gtk_table_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
+static void gtk_table_compute_expand (GtkWidget *widget,
+ gboolean *hexpand,
+ gboolean *vexpand);
static void gtk_table_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_table_remove (GtkContainer *container,
static void gtk_table_size_allocate_pass2 (GtkTable *table);
-static GtkContainerClass *parent_class = NULL;
-
-
-GType
-gtk_table_get_type (void)
-{
- static GType table_type = 0;
-
- if (!table_type)
- {
- static const GTypeInfo table_info =
- {
- sizeof (GtkTableClass),
- NULL,
- NULL,
- (GClassInitFunc) gtk_table_class_init,
- NULL,
- NULL,
- sizeof (GtkTable),
- 0,
- (GInstanceInitFunc) gtk_table_init,
- };
-
- table_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTable"),
- &table_info, 0);
- }
-
- return table_type;
-}
+G_DEFINE_TYPE (GtkTable, gtk_table, GTK_TYPE_CONTAINER)
static void
gtk_table_class_init (GtkTableClass *class)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
-
gobject_class->finalize = gtk_table_finalize;
gobject_class->get_property = gtk_table_get_property;
gobject_class->set_property = gtk_table_set_property;
- widget_class->size_request = gtk_table_size_request;
+ widget_class->get_preferred_width = gtk_table_get_preferred_width;
+ widget_class->get_preferred_height = gtk_table_get_preferred_height;
widget_class->size_allocate = gtk_table_size_allocate;
+ widget_class->compute_expand = gtk_table_compute_expand;
container_class->add = gtk_table_add;
container_class->remove = gtk_table_remove;
container_class->child_type = gtk_table_child_type;
container_class->set_child_property = gtk_table_set_child_property;
container_class->get_child_property = gtk_table_get_child_property;
-
+ gtk_container_class_handle_border_width (container_class);
g_object_class_install_property (gobject_class,
PROP_N_ROWS,
g_param_spec_uint ("n-rows",
P_("Rows"),
P_("The number of rows in the table"),
- 0,
- G_MAXUINT,
- 0,
+ 1,
+ 65535,
+ 1,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_N_COLUMNS,
g_param_spec_uint ("n-columns",
P_("Columns"),
P_("The number of columns in the table"),
- 0,
- G_MAXUINT,
- 0,
+ 1,
+ 65535,
+ 1,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_ROW_SPACING,
P_("Row spacing"),
P_("The amount of space between two consecutive rows"),
0,
- G_MAXUINT,
+ 65535,
0,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
P_("Column spacing"),
P_("The amount of space between two consecutive columns"),
0,
- G_MAXUINT,
+ 65535,
0,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HOMOGENEOUS,
g_param_spec_boolean ("homogeneous",
- P_("Homogenous"),
- P_("If TRUE this means the table cells are all the same width/height"),
+ P_("Homogeneous"),
+ P_("If TRUE, the table cells are all the same width/height"),
FALSE,
GTK_PARAM_READWRITE));
P_("Extra space to put between the child and its upper and lower neighbors, in pixels"),
0, 65535, 0,
GTK_PARAM_READWRITE));
+
+ g_type_class_add_private (class, sizeof (GtkTablePrivate));
+}
+
+static void
+gtk_table_compute_expand (GtkWidget *widget,
+ gboolean *hexpand_p,
+ gboolean *vexpand_p)
+{
+ GtkTable *table = GTK_TABLE (widget);
+ GtkTablePrivate *priv = table->priv;
+ GList *list;
+ GtkTableChild *child;
+ gboolean hexpand;
+ gboolean vexpand;
+
+ hexpand = FALSE;
+ vexpand = FALSE;
+
+ for (list = priv->children; list; list = list->next)
+ {
+ child = list->data;
+
+ if (!hexpand)
+ hexpand = child->xexpand ||
+ gtk_widget_compute_expand (child->widget,
+ GTK_ORIENTATION_HORIZONTAL);
+
+ if (!vexpand)
+ vexpand = child->yexpand ||
+ gtk_widget_compute_expand (child->widget,
+ GTK_ORIENTATION_VERTICAL);
+
+ if (hexpand && vexpand)
+ break;
+ }
+
+ *hexpand_p = hexpand;
+ *vexpand_p = vexpand;
}
static GType
GValue *value,
GParamSpec *pspec)
{
- GtkTable *table;
-
- table = GTK_TABLE (object);
+ GtkTable *table = GTK_TABLE (object);
+ GtkTablePrivate *priv = table->priv;
switch (prop_id)
{
case PROP_N_ROWS:
- g_value_set_uint (value, table->nrows);
+ g_value_set_uint (value, priv->nrows);
break;
case PROP_N_COLUMNS:
- g_value_set_uint (value, table->ncols);
+ g_value_set_uint (value, priv->ncols);
break;
case PROP_ROW_SPACING:
- g_value_set_uint (value, table->row_spacing);
+ g_value_set_uint (value, priv->row_spacing);
break;
case PROP_COLUMN_SPACING:
- g_value_set_uint (value, table->column_spacing);
+ g_value_set_uint (value, priv->column_spacing);
break;
case PROP_HOMOGENEOUS:
- g_value_set_boolean (value, table->homogeneous);
+ g_value_set_boolean (value, priv->homogeneous);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
const GValue *value,
GParamSpec *pspec)
{
- GtkTable *table;
-
- table = GTK_TABLE (object);
+ GtkTable *table = GTK_TABLE (object);
+ GtkTablePrivate *priv = table->priv;
switch (prop_id)
{
case PROP_N_ROWS:
- gtk_table_resize (table, g_value_get_uint (value), table->ncols);
+ gtk_table_resize (table, g_value_get_uint (value), priv->ncols);
break;
case PROP_N_COLUMNS:
- gtk_table_resize (table, table->nrows, g_value_get_uint (value));
+ gtk_table_resize (table, priv->nrows, g_value_get_uint (value));
break;
case PROP_ROW_SPACING:
gtk_table_set_row_spacings (table, g_value_get_uint (value));
GParamSpec *pspec)
{
GtkTable *table = GTK_TABLE (container);
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *table_child;
GList *list;
table_child = NULL;
- for (list = table->children; list; list = list->next)
+ for (list = priv->children; list; list = list->next)
{
table_child = list->data;
table_child->left_attach = g_value_get_uint (value);
if (table_child->right_attach <= table_child->left_attach)
table_child->right_attach = table_child->left_attach + 1;
- if (table_child->right_attach >= table->ncols)
- gtk_table_resize (table, table->nrows, table_child->right_attach);
+ if (table_child->right_attach >= priv->ncols)
+ gtk_table_resize (table, priv->nrows, table_child->right_attach);
break;
case CHILD_PROP_RIGHT_ATTACH:
table_child->right_attach = g_value_get_uint (value);
if (table_child->right_attach <= table_child->left_attach)
table_child->left_attach = table_child->right_attach - 1;
- if (table_child->right_attach >= table->ncols)
- gtk_table_resize (table, table->nrows, table_child->right_attach);
+ if (table_child->right_attach >= priv->ncols)
+ gtk_table_resize (table, priv->nrows, table_child->right_attach);
break;
case CHILD_PROP_TOP_ATTACH:
table_child->top_attach = g_value_get_uint (value);
if (table_child->bottom_attach <= table_child->top_attach)
table_child->bottom_attach = table_child->top_attach + 1;
- if (table_child->bottom_attach >= table->nrows)
- gtk_table_resize (table, table_child->bottom_attach, table->ncols);
+ if (table_child->bottom_attach >= priv->nrows)
+ gtk_table_resize (table, table_child->bottom_attach, priv->ncols);
break;
case CHILD_PROP_BOTTOM_ATTACH:
table_child->bottom_attach = g_value_get_uint (value);
if (table_child->bottom_attach <= table_child->top_attach)
table_child->top_attach = table_child->bottom_attach - 1;
- if (table_child->bottom_attach >= table->nrows)
- gtk_table_resize (table, table_child->bottom_attach, table->ncols);
+ if (table_child->bottom_attach >= priv->nrows)
+ gtk_table_resize (table, table_child->bottom_attach, priv->ncols);
break;
case CHILD_PROP_X_OPTIONS:
- table_child->xexpand = (g_value_get_flags (value) & GTK_EXPAND) != 0;
- table_child->xshrink = (g_value_get_flags (value) & GTK_SHRINK) != 0;
- table_child->xfill = (g_value_get_flags (value) & GTK_FILL) != 0;
+ {
+ gboolean xexpand;
+
+ xexpand = (g_value_get_flags (value) & GTK_EXPAND) != 0;
+
+ if (table_child->xexpand != xexpand)
+ {
+ table_child->xexpand = xexpand;
+ gtk_widget_queue_compute_expand (GTK_WIDGET (table));
+ }
+
+ table_child->xshrink = (g_value_get_flags (value) & GTK_SHRINK) != 0;
+ table_child->xfill = (g_value_get_flags (value) & GTK_FILL) != 0;
+ }
break;
case CHILD_PROP_Y_OPTIONS:
- table_child->yexpand = (g_value_get_flags (value) & GTK_EXPAND) != 0;
- table_child->yshrink = (g_value_get_flags (value) & GTK_SHRINK) != 0;
- table_child->yfill = (g_value_get_flags (value) & GTK_FILL) != 0;
+ {
+ gboolean yexpand;
+
+ yexpand = (g_value_get_flags (value) & GTK_EXPAND) != 0;
+
+ if (table_child->yexpand != yexpand)
+ {
+ table_child->yexpand = yexpand;
+ gtk_widget_queue_compute_expand (GTK_WIDGET (table));
+ }
+
+ table_child->yshrink = (g_value_get_flags (value) & GTK_SHRINK) != 0;
+ table_child->yfill = (g_value_get_flags (value) & GTK_FILL) != 0;
+ }
break;
case CHILD_PROP_X_PADDING:
table_child->xpadding = g_value_get_uint (value);
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
break;
}
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (table))
+ if (gtk_widget_get_visible (child) &&
+ gtk_widget_get_visible (GTK_WIDGET (table)))
gtk_widget_queue_resize (child);
}
GParamSpec *pspec)
{
GtkTable *table = GTK_TABLE (container);
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *table_child;
GList *list;
table_child = NULL;
- for (list = table->children; list; list = list->next)
+ for (list = priv->children; list; list = list->next)
{
table_child = list->data;
static void
gtk_table_init (GtkTable *table)
{
- GTK_WIDGET_SET_FLAGS (table, GTK_NO_WINDOW);
+ GtkTablePrivate *priv;
+
+ table->priv = G_TYPE_INSTANCE_GET_PRIVATE (table,
+ GTK_TYPE_TABLE,
+ GtkTablePrivate);
+ priv = table->priv;
+
+ gtk_widget_set_has_window (GTK_WIDGET (table), FALSE);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (table), FALSE);
-
- table->children = NULL;
- table->rows = NULL;
- table->cols = NULL;
- table->nrows = 0;
- table->ncols = 0;
- table->column_spacing = 0;
- table->row_spacing = 0;
- table->homogeneous = FALSE;
+
+ priv->children = NULL;
+ priv->rows = NULL;
+ priv->cols = NULL;
+ priv->nrows = 0;
+ priv->ncols = 0;
+ priv->column_spacing = 0;
+ priv->row_spacing = 0;
+ priv->homogeneous = FALSE;
gtk_table_resize (table, 1, 1);
}
+/**
+ * gtk_table_new:
+ * @rows: The number of rows the new table should have.
+ * @columns: The number of columns the new table should have.
+ * @homogeneous: If set to %TRUE, all table cells are resized to the size of
+ * the cell containing the largest widget.
+ *
+ * Used to create a new table widget. An initial size must be given by
+ * specifying how many rows and columns the table should have, although
+ * this can be changed later with gtk_table_resize(). @rows and @columns
+ * must both be in the range 1 .. 65535. For historical reasons, 0 is accepted
+ * as well and is silently interpreted as 1.
+ *
+ * Returns: A pointer to the the newly created table widget.
+ *
+ * Deprecated: 3.4: Use gtk_grid_new().
+ */
GtkWidget*
gtk_table_new (guint rows,
guint columns,
gboolean homogeneous)
{
GtkTable *table;
+ GtkTablePrivate *priv;
if (rows == 0)
rows = 1;
columns = 1;
table = g_object_new (GTK_TYPE_TABLE, NULL);
-
- table->homogeneous = (homogeneous ? TRUE : FALSE);
+ priv = table->priv;
+
+ priv->homogeneous = (homogeneous ? TRUE : FALSE);
gtk_table_resize (table, rows, columns);
return GTK_WIDGET (table);
}
+/**
+ * gtk_table_resize:
+ * @table: The #GtkTable you wish to change the size of.
+ * @rows: The new number of rows.
+ * @columns: The new number of columns.
+ *
+ * If you need to change a table's size <emphasis>after</emphasis>
+ * it has been created, this function allows you to do so.
+ *
+ * Deprecated: 3.4: #GtkGrid resizes automatically.
+ */
void
gtk_table_resize (GtkTable *table,
guint n_rows,
guint n_cols)
{
+ GtkTablePrivate *priv;
+
g_return_if_fail (GTK_IS_TABLE (table));
- g_return_if_fail (n_rows > 0 && n_rows < 65536);
- g_return_if_fail (n_cols > 0 && n_cols < 65536);
+ g_return_if_fail (n_rows > 0 && n_rows <= 65535);
+ g_return_if_fail (n_cols > 0 && n_cols <= 65535);
+
+ priv = table->priv;
n_rows = MAX (n_rows, 1);
n_cols = MAX (n_cols, 1);
- if (n_rows != table->nrows ||
- n_cols != table->ncols)
+ if (n_rows != priv->nrows ||
+ n_cols != priv->ncols)
{
GList *list;
- for (list = table->children; list; list = list->next)
+ for (list = priv->children; list; list = list->next)
{
GtkTableChild *child;
n_rows = MAX (n_rows, child->bottom_attach);
n_cols = MAX (n_cols, child->right_attach);
}
-
- if (n_rows != table->nrows)
+
+ if (n_rows != priv->nrows)
{
guint i;
- i = table->nrows;
- table->nrows = n_rows;
- table->rows = g_realloc (table->rows, table->nrows * sizeof (GtkTableRowCol));
-
- for (; i < table->nrows; i++)
+ i = priv->nrows;
+ priv->nrows = n_rows;
+ priv->rows = g_realloc (priv->rows, priv->nrows * sizeof (GtkTableRowCol));
+
+ for (; i < priv->nrows; i++)
{
- table->rows[i].requisition = 0;
- table->rows[i].allocation = 0;
- table->rows[i].spacing = table->row_spacing;
- table->rows[i].need_expand = 0;
- table->rows[i].need_shrink = 0;
- table->rows[i].expand = 0;
- table->rows[i].shrink = 0;
+ priv->rows[i].requisition = 0;
+ priv->rows[i].allocation = 0;
+ priv->rows[i].spacing = priv->row_spacing;
+ priv->rows[i].need_expand = 0;
+ priv->rows[i].need_shrink = 0;
+ priv->rows[i].expand = 0;
+ priv->rows[i].shrink = 0;
}
g_object_notify (G_OBJECT (table), "n-rows");
}
- if (n_cols != table->ncols)
+ if (n_cols != priv->ncols)
{
guint i;
- i = table->ncols;
- table->ncols = n_cols;
- table->cols = g_realloc (table->cols, table->ncols * sizeof (GtkTableRowCol));
-
- for (; i < table->ncols; i++)
+ i = priv->ncols;
+ priv->ncols = n_cols;
+ priv->cols = g_realloc (priv->cols, priv->ncols * sizeof (GtkTableRowCol));
+
+ for (; i < priv->ncols; i++)
{
- table->cols[i].requisition = 0;
- table->cols[i].allocation = 0;
- table->cols[i].spacing = table->column_spacing;
- table->cols[i].need_expand = 0;
- table->cols[i].need_shrink = 0;
- table->cols[i].expand = 0;
- table->cols[i].shrink = 0;
+ priv->cols[i].requisition = 0;
+ priv->cols[i].allocation = 0;
+ priv->cols[i].spacing = priv->column_spacing;
+ priv->cols[i].need_expand = 0;
+ priv->cols[i].need_shrink = 0;
+ priv->cols[i].expand = 0;
+ priv->cols[i].shrink = 0;
}
g_object_notify (G_OBJECT (table), "n-columns");
}
}
+/**
+ * gtk_table_attach:
+ * @table: The #GtkTable to add a new widget to.
+ * @child: The widget to add.
+ * @left_attach: the column number to attach the left side of a child widget to.
+ * @right_attach: the column number to attach the right side of a child widget to.
+ * @top_attach: the row number to attach the top of a child widget to.
+ * @bottom_attach: the row number to attach the bottom of a child widget to.
+ * @xoptions: Used to specify the properties of the child widget when the table is resized.
+ * @yoptions: The same as xoptions, except this field determines behaviour of vertical resizing.
+ * @xpadding: An integer value specifying the padding on the left and right of the widget being added to the table.
+ * @ypadding: The amount of padding above and below the child widget.
+ *
+ * Adds a widget to a table. The number of 'cells' that a widget will occupy is
+ * specified by @left_attach, @right_attach, @top_attach and @bottom_attach.
+ * These each represent the leftmost, rightmost, uppermost and lowest column
+ * and row numbers of the table. (Columns and rows are indexed from zero).
+ *
+ * To make a button occupy the lower right cell of a 2x2 table, use
+ * <informalexample><programlisting>
+ * gtk_table_attach (table, button,
+ * 1, 2, // left, right attach
+ * 1, 2, // top, bottom attach
+ * xoptions, yoptions,
+ * xpadding, ypadding);
+ * </programlisting></informalexample>
+ * If you want to make the button span the entire bottom row, use @left_attach == 0 and @right_attach = 2 instead.
+ *
+ * Deprecated: 3.4: Use gtk_grid_attach() with #GtkGrid. Note that the attach
+ * arguments differ between those two functions.
+ */
void
gtk_table_attach (GtkTable *table,
GtkWidget *child,
guint xpadding,
guint ypadding)
{
+ GtkTablePrivate *priv;
GtkTableChild *table_child;
-
+
g_return_if_fail (GTK_IS_TABLE (table));
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);
+
/* g_return_if_fail (left_attach >= 0); */
g_return_if_fail (left_attach < right_attach);
/* g_return_if_fail (top_attach >= 0); */
g_return_if_fail (top_attach < bottom_attach);
-
- if (right_attach >= table->ncols)
- gtk_table_resize (table, table->nrows, right_attach);
-
- if (bottom_attach >= table->nrows)
- gtk_table_resize (table, bottom_attach, table->ncols);
-
+
+ priv = table->priv;
+
+ if (right_attach >= priv->ncols)
+ gtk_table_resize (table, priv->nrows, right_attach);
+
+ if (bottom_attach >= priv->nrows)
+ gtk_table_resize (table, bottom_attach, priv->ncols);
+
table_child = g_new (GtkTableChild, 1);
table_child->widget = child;
table_child->left_attach = left_attach;
table_child->yshrink = (yoptions & GTK_SHRINK) != 0;
table_child->yfill = (yoptions & GTK_FILL) != 0;
table_child->ypadding = ypadding;
-
- table->children = g_list_prepend (table->children, table_child);
-
+
+ priv->children = g_list_prepend (priv->children, table_child);
+
gtk_widget_set_parent (child, GTK_WIDGET (table));
}
+/**
+ * gtk_table_attach_defaults:
+ * @table: The table to add a new child widget to.
+ * @widget: The child widget to add.
+ * @left_attach: The column number to attach the left side of the child widget to.
+ * @right_attach: The column number to attach the right side of the child widget to.
+ * @top_attach: The row number to attach the top of the child widget to.
+ * @bottom_attach: The row number to attach the bottom of the child widget to.
+ *
+ * As there are many options associated with gtk_table_attach(), this convenience
+ * function provides the programmer with a means to add children to a table with
+ * identical padding and expansion options. The values used for the #GtkAttachOptions
+ * are <literal>GTK_EXPAND | GTK_FILL</literal>, and the padding is set to 0.
+ *
+ * Deprecated: 3.4: Use gtk_grid_attach() with #GtkGrid. Note that the attach
+ * arguments differ between those two functions.
+ */
void
gtk_table_attach_defaults (GtkTable *table,
GtkWidget *widget,
0, 0);
}
+/**
+ * gtk_table_set_row_spacing:
+ * @table: a #GtkTable containing the row whose properties you wish to change.
+ * @row: row number whose spacing will be changed.
+ * @spacing: number of pixels that the spacing should take up.
+ *
+ * Changes the space between a given table row and the subsequent row.
+ *
+ * Deprecated: 3.4: Use gtk_widget_set_margin_top() and
+ * gtk_widget_set_margin_bottom() on the widgets contained in the row if
+ * you need this functionality. #GtkGrid does not support per-row spacing.
+ */
void
gtk_table_set_row_spacing (GtkTable *table,
guint row,
guint spacing)
{
+ GtkTablePrivate *priv;
+
g_return_if_fail (GTK_IS_TABLE (table));
- g_return_if_fail (row < table->nrows);
-
- if (table->rows[row].spacing != spacing)
+
+ priv = table->priv;
+
+ g_return_if_fail (row < priv->nrows);
+
+ if (priv->rows[row].spacing != spacing)
{
- table->rows[row].spacing = spacing;
-
- if (GTK_WIDGET_VISIBLE (table))
+ priv->rows[row].spacing = spacing;
+
+ if (gtk_widget_get_visible (GTK_WIDGET (table)))
gtk_widget_queue_resize (GTK_WIDGET (table));
}
}
* row @row + 1. See gtk_table_set_row_spacing().
*
* Return value: the row spacing
+ *
+ * Deprecated: 3.4: #GtkGrid does not offer a replacement for this
+ * functionality.
**/
guint
gtk_table_get_row_spacing (GtkTable *table,
guint row)
{
+ GtkTablePrivate *priv;
+
g_return_val_if_fail (GTK_IS_TABLE (table), 0);
- g_return_val_if_fail (row < table->nrows - 1, 0);
-
- return table->rows[row].spacing;
+
+ priv = table->priv;
+
+ g_return_val_if_fail (row < priv->nrows - 1, 0);
+
+ return priv->rows[row].spacing;
}
+/**
+ * gtk_table_set_col_spacing:
+ * @table: a #GtkTable.
+ * @column: the column whose spacing should be changed.
+ * @spacing: number of pixels that the spacing should take up.
+ *
+ * Alters the amount of space between a given table column and the following
+ * column.
+ *
+ * Deprecated: 3.4: Use gtk_widget_set_margin_left() and
+ * gtk_widget_set_margin_right() on the widgets contained in the row if
+ * you need this functionality. #GtkGrid does not support per-row spacing.
+ */
void
gtk_table_set_col_spacing (GtkTable *table,
guint column,
guint spacing)
{
+ GtkTablePrivate *priv;
+
g_return_if_fail (GTK_IS_TABLE (table));
- g_return_if_fail (column < table->ncols);
-
- if (table->cols[column].spacing != spacing)
+
+ priv = table->priv;
+
+ g_return_if_fail (column < priv->ncols);
+
+ if (priv->cols[column].spacing != spacing)
{
- table->cols[column].spacing = spacing;
-
- if (GTK_WIDGET_VISIBLE (table))
+ priv->cols[column].spacing = spacing;
+
+ if (gtk_widget_get_visible (GTK_WIDGET (table)))
gtk_widget_queue_resize (GTK_WIDGET (table));
}
}
* column @col + 1. See gtk_table_set_col_spacing().
*
* Return value: the column spacing
+ *
+ * Deprecated: 3.4: #GtkGrid does not offer a replacement for this
+ * functionality.
**/
guint
gtk_table_get_col_spacing (GtkTable *table,
guint column)
{
+ GtkTablePrivate *priv;
+
g_return_val_if_fail (GTK_IS_TABLE (table), 0);
- g_return_val_if_fail (column < table->ncols, 0);
- return table->cols[column].spacing;
+ priv = table->priv;
+
+ g_return_val_if_fail (column < priv->ncols, 0);
+
+ return priv->cols[column].spacing;
}
+/**
+ * gtk_table_set_row_spacings:
+ * @table: a #GtkTable.
+ * @spacing: the number of pixels of space to place between every row in the table.
+ *
+ * Sets the space between every row in @table equal to @spacing.
+ *
+ * Deprecated: 3.4: Use gtk_grid_set_row_spacing() with #GtkGrid.
+ */
void
gtk_table_set_row_spacings (GtkTable *table,
guint spacing)
{
+ GtkTablePrivate *priv;
guint row;
g_return_if_fail (GTK_IS_TABLE (table));
-
- table->row_spacing = spacing;
- for (row = 0; row < table->nrows; row++)
- table->rows[row].spacing = spacing;
-
- if (GTK_WIDGET_VISIBLE (table))
+
+ priv = table->priv;
+
+ priv->row_spacing = spacing;
+ for (row = 0; row < priv->nrows; row++)
+ priv->rows[row].spacing = spacing;
+
+ if (gtk_widget_get_visible (GTK_WIDGET (table)))
gtk_widget_queue_resize (GTK_WIDGET (table));
g_object_notify (G_OBJECT (table), "row-spacing");
* the spacing that will be used for newly added rows.
* (See gtk_table_set_row_spacings())
*
- * Returns value: the default row spacing
+ * Return value: the default row spacing
+ *
+ * Deprecated: 3.4: Use gtk_grid_get_row_spacing() with #GtkGrid.
**/
guint
gtk_table_get_default_row_spacing (GtkTable *table)
{
g_return_val_if_fail (GTK_IS_TABLE (table), 0);
- return table->row_spacing;
+ return table->priv->row_spacing;
}
+/**
+ * gtk_table_set_col_spacings:
+ * @table: a #GtkTable.
+ * @spacing: the number of pixels of space to place between every column
+ * in the table.
+ *
+ * Sets the space between every column in @table equal to @spacing.
+ *
+ * Deprecated: 3.4: Use gtk_grid_set_column_spacing() with #GtkGrid.
+ */
void
gtk_table_set_col_spacings (GtkTable *table,
guint spacing)
{
+ GtkTablePrivate *priv;
guint col;
-
+
g_return_if_fail (GTK_IS_TABLE (table));
-
- table->column_spacing = spacing;
- for (col = 0; col < table->ncols; col++)
- table->cols[col].spacing = spacing;
-
- if (GTK_WIDGET_VISIBLE (table))
+
+ priv = table->priv;
+
+ priv->column_spacing = spacing;
+ for (col = 0; col < priv->ncols; col++)
+ priv->cols[col].spacing = spacing;
+
+ if (gtk_widget_get_visible (GTK_WIDGET (table)))
gtk_widget_queue_resize (GTK_WIDGET (table));
g_object_notify (G_OBJECT (table), "column-spacing");
* the spacing that will be used for newly added columns.
* (See gtk_table_set_col_spacings())
*
- * Returns value: the default column spacing
+ * Return value: the default column spacing
+ *
+ * Deprecated: 3.4: Use gtk_grid_get_column_spacing() with #GtkGrid.
**/
guint
gtk_table_get_default_col_spacing (GtkTable *table)
{
g_return_val_if_fail (GTK_IS_TABLE (table), 0);
- return table->column_spacing;
+ return table->priv->column_spacing;
}
+/**
+ * gtk_table_set_homogeneous:
+ * @table: The #GtkTable you wish to set the homogeneous properties of.
+ * @homogeneous: Set to %TRUE to ensure all table cells are the same size. Set
+ * to %FALSE if this is not your desired behaviour.
+ *
+ * Changes the homogenous property of table cells, ie. whether all cells are
+ * an equal size or not.
+ *
+ * Deprecated: 3.4: Use gtk_grid_set_row_homogeneous() and
+ * gtk_grid_set_column_homogeneous() with #GtkGrid.
+ */
void
gtk_table_set_homogeneous (GtkTable *table,
gboolean homogeneous)
{
+ GtkTablePrivate *priv;
+
g_return_if_fail (GTK_IS_TABLE (table));
+ priv = table->priv;
+
homogeneous = (homogeneous != 0);
- if (homogeneous != table->homogeneous)
+ if (homogeneous != priv->homogeneous)
{
- table->homogeneous = homogeneous;
+ priv->homogeneous = homogeneous;
- if (GTK_WIDGET_VISIBLE (table))
+ if (gtk_widget_get_visible (GTK_WIDGET (table)))
gtk_widget_queue_resize (GTK_WIDGET (table));
g_object_notify (G_OBJECT (table), "homogeneous");
* width and height. (See gtk_table_set_homogenous ())
*
* Return value: %TRUE if the cells are all constrained to the same size
+ *
+ * Deprecated: 3.4: Use gtk_grid_get_row_homogeneous() and
+ * gtk_grid_get_column_homogeneous() with #GtkGrid.
**/
gboolean
gtk_table_get_homogeneous (GtkTable *table)
{
g_return_val_if_fail (GTK_IS_TABLE (table), FALSE);
- return table->homogeneous;
+ return table->priv->homogeneous;
+}
+
+/**
+ * gtk_table_get_size:
+ * @table: a #GtkTable
+ * @rows: (out) (allow-none): return location for the number of
+ * rows, or %NULL
+ * @columns: (out) (allow-none): return location for the number
+ * of columns, or %NULL
+ *
+ * Gets the number of rows and columns in the table.
+ *
+ * Since: 2.22
+ *
+ * Deprecated: 3.4: #GtkGrid does not expose the number of columns and
+ * rows.
+ **/
+void
+gtk_table_get_size (GtkTable *table,
+ guint *rows,
+ guint *columns)
+{
+ GtkTablePrivate *priv;
+
+ g_return_if_fail (GTK_IS_TABLE (table));
+
+ priv = table->priv;
+
+ if (rows)
+ *rows = priv->nrows;
+
+ if (columns)
+ *columns = priv->ncols;
}
static void
gtk_table_finalize (GObject *object)
{
- GtkTable *table;
-
- g_return_if_fail (GTK_IS_TABLE (object));
-
- table = GTK_TABLE (object);
-
- g_free (table->rows);
- g_free (table->cols);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ GtkTable *table = GTK_TABLE (object);
+ GtkTablePrivate *priv = table->priv;
+
+ g_free (priv->rows);
+ g_free (priv->cols);
+
+ G_OBJECT_CLASS (gtk_table_parent_class)->finalize (object);
}
static void
-gtk_table_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_table_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
- GtkTable *table;
- gint row, col;
-
- g_return_if_fail (GTK_IS_TABLE (widget));
- g_return_if_fail (requisition != NULL);
-
- table = GTK_TABLE (widget);
-
- requisition->width = 0;
- requisition->height = 0;
-
+ GtkTable *table = GTK_TABLE (widget);
+ GtkTablePrivate *priv = table->priv;
+ gint col;
+
gtk_table_size_request_init (table);
gtk_table_size_request_pass1 (table);
gtk_table_size_request_pass2 (table);
gtk_table_size_request_pass3 (table);
gtk_table_size_request_pass2 (table);
-
- for (col = 0; col < table->ncols; col++)
- requisition->width += table->cols[col].requisition;
- for (col = 0; col + 1 < table->ncols; col++)
- requisition->width += table->cols[col].spacing;
-
- for (row = 0; row < table->nrows; row++)
- requisition->height += table->rows[row].requisition;
- for (row = 0; row + 1 < table->nrows; row++)
- requisition->height += table->rows[row].spacing;
-
- requisition->width += GTK_CONTAINER (table)->border_width * 2;
- requisition->height += GTK_CONTAINER (table)->border_width * 2;
+
+ *minimum = 0;
+
+ for (col = 0; col < priv->ncols; col++)
+ *minimum += priv->cols[col].requisition;
+ for (col = 0; col + 1 < priv->ncols; col++)
+ *minimum += priv->cols[col].spacing;
+
+ *natural = *minimum;
+}
+
+static void
+gtk_table_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkTable *table = GTK_TABLE (widget);
+ GtkTablePrivate *priv = table->priv;
+ gint row;
+
+ gtk_table_size_request_init (table);
+ gtk_table_size_request_pass1 (table);
+ gtk_table_size_request_pass2 (table);
+ gtk_table_size_request_pass3 (table);
+ gtk_table_size_request_pass2 (table);
+
+ *minimum = 0;
+ for (row = 0; row < priv->nrows; row++)
+ *minimum += priv->rows[row].requisition;
+ for (row = 0; row + 1 < priv->nrows; row++)
+ *minimum += priv->rows[row].spacing;
+
+ *natural = *minimum;
}
static void
gtk_table_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkTable *table;
-
- g_return_if_fail (GTK_IS_TABLE (widget));
- g_return_if_fail (allocation != NULL);
-
- widget->allocation = *allocation;
- table = GTK_TABLE (widget);
-
+ GtkTable *table = GTK_TABLE (widget);
+
+ gtk_widget_set_allocation (widget, allocation);
+
gtk_table_size_allocate_init (table);
gtk_table_size_allocate_pass1 (table);
gtk_table_size_allocate_pass2 (table);
gtk_table_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_TABLE (container));
- g_return_if_fail (widget != NULL);
-
gtk_table_attach_defaults (GTK_TABLE (container), widget, 0, 1, 0, 1);
}
gtk_table_remove (GtkContainer *container,
GtkWidget *widget)
{
- GtkTable *table;
+ GtkTable *table = GTK_TABLE (container);
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
+ GtkWidget *widget_container = GTK_WIDGET (container);
GList *children;
-
- g_return_if_fail (GTK_IS_TABLE (container));
- g_return_if_fail (widget != NULL);
-
- table = GTK_TABLE (container);
- children = table->children;
-
+
+ children = priv->children;
+
while (children)
{
child = children->data;
if (child->widget == widget)
{
- gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
+ gboolean was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
-
- table->children = g_list_remove (table->children, child);
+
+ priv->children = g_list_remove (priv->children, child);
g_free (child);
- if (was_visible && GTK_WIDGET_VISIBLE (container))
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ if (was_visible && gtk_widget_get_visible (widget_container))
+ gtk_widget_queue_resize (widget_container);
break;
}
}
GtkCallback callback,
gpointer callback_data)
{
- GtkTable *table;
+ GtkTable *table = GTK_TABLE (container);
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
-
- g_return_if_fail (GTK_IS_TABLE (container));
- g_return_if_fail (callback != NULL);
-
- table = GTK_TABLE (container);
- children = table->children;
-
+
+ children = priv->children;
+
while (children)
{
child = children->data;
static void
gtk_table_size_request_init (GtkTable *table)
{
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint row, col;
-
- for (row = 0; row < table->nrows; row++)
+
+ for (row = 0; row < priv->nrows; row++)
{
- table->rows[row].requisition = 0;
- table->rows[row].expand = FALSE;
+ priv->rows[row].requisition = 0;
+ priv->rows[row].expand = FALSE;
}
- for (col = 0; col < table->ncols; col++)
+ for (col = 0; col < priv->ncols; col++)
{
- table->cols[col].requisition = 0;
- table->cols[col].expand = FALSE;
+ priv->cols[col].requisition = 0;
+ priv->cols[col].expand = FALSE;
}
- children = table->children;
+ children = priv->children;
while (children)
{
child = children->data;
children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget))
- gtk_widget_size_request (child->widget, NULL);
- if (child->left_attach == (child->right_attach - 1) && child->xexpand)
- table->cols[child->left_attach].expand = TRUE;
+ if (child->left_attach == (child->right_attach - 1) &&
+ (child->xexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_HORIZONTAL)))
+ priv->cols[child->left_attach].expand = TRUE;
- if (child->top_attach == (child->bottom_attach - 1) && child->yexpand)
- table->rows[child->top_attach].expand = TRUE;
+ if (child->top_attach == (child->bottom_attach - 1) &&
+ (child->yexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_VERTICAL)))
+ priv->rows[child->top_attach].expand = TRUE;
}
}
static void
gtk_table_size_request_pass1 (GtkTable *table)
{
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint width;
gint height;
-
- children = table->children;
+
+ children = priv->children;
while (children)
{
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
GtkRequisition child_requisition;
- gtk_widget_get_child_requisition (child->widget, &child_requisition);
+
+ gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
/* Child spans a single column.
*/
if (child->left_attach == (child->right_attach - 1))
{
width = child_requisition.width + child->xpadding * 2;
- table->cols[child->left_attach].requisition = MAX (table->cols[child->left_attach].requisition, width);
+ priv->cols[child->left_attach].requisition = MAX (priv->cols[child->left_attach].requisition, width);
}
/* Child spans a single row.
if (child->top_attach == (child->bottom_attach - 1))
{
height = child_requisition.height + child->ypadding * 2;
- table->rows[child->top_attach].requisition = MAX (table->rows[child->top_attach].requisition, height);
+ priv->rows[child->top_attach].requisition = MAX (priv->rows[child->top_attach].requisition, height);
}
}
}
static void
gtk_table_size_request_pass2 (GtkTable *table)
{
+ GtkTablePrivate *priv = table->priv;
gint max_width;
gint max_height;
gint row, col;
-
- if (table->homogeneous)
+
+ if (priv->homogeneous)
{
max_width = 0;
max_height = 0;
-
- for (col = 0; col < table->ncols; col++)
- max_width = MAX (max_width, table->cols[col].requisition);
- for (row = 0; row < table->nrows; row++)
- max_height = MAX (max_height, table->rows[row].requisition);
-
- for (col = 0; col < table->ncols; col++)
- table->cols[col].requisition = max_width;
- for (row = 0; row < table->nrows; row++)
- table->rows[row].requisition = max_height;
+
+ for (col = 0; col < priv->ncols; col++)
+ max_width = MAX (max_width, priv->cols[col].requisition);
+ for (row = 0; row < priv->nrows; row++)
+ max_height = MAX (max_height, priv->rows[row].requisition);
+
+ for (col = 0; col < priv->ncols; col++)
+ priv->cols[col].requisition = max_width;
+ for (row = 0; row < priv->nrows; row++)
+ priv->rows[row].requisition = max_height;
}
}
static void
gtk_table_size_request_pass3 (GtkTable *table)
{
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint width, height;
gint row, col;
gint extra;
-
- children = table->children;
+
+ children = priv->children;
while (children)
{
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
/* Child spans multiple columns.
*/
{
GtkRequisition child_requisition;
- gtk_widget_get_child_requisition (child->widget, &child_requisition);
-
+ gtk_widget_get_preferred_size (child->widget,
+ &child_requisition, NULL);
+
/* Check and see if there is already enough space
* for the child.
*/
width = 0;
for (col = child->left_attach; col < child->right_attach; col++)
{
- width += table->cols[col].requisition;
+ width += priv->cols[col].requisition;
if ((col + 1) < child->right_attach)
- width += table->cols[col].spacing;
+ width += priv->cols[col].spacing;
}
/* If we need to request more space for this child to fill
width = child_requisition.width + child->xpadding * 2 - width;
for (col = child->left_attach; col < child->right_attach; col++)
- if (table->cols[col].expand)
+ if (priv->cols[col].expand)
n_expand++;
if (n_expand == 0)
}
for (col = child->left_attach; col < child->right_attach; col++)
- if (force_expand || table->cols[col].expand)
+ if (force_expand || priv->cols[col].expand)
{
extra = width / n_expand;
- table->cols[col].requisition += extra;
+ priv->cols[col].requisition += extra;
width -= extra;
n_expand--;
}
{
GtkRequisition child_requisition;
- gtk_widget_get_child_requisition (child->widget, &child_requisition);
+ gtk_widget_get_preferred_size (child->widget,
+ &child_requisition, NULL);
/* Check and see if there is already enough space
* for the child.
height = 0;
for (row = child->top_attach; row < child->bottom_attach; row++)
{
- height += table->rows[row].requisition;
+ height += priv->rows[row].requisition;
if ((row + 1) < child->bottom_attach)
- height += table->rows[row].spacing;
+ height += priv->rows[row].spacing;
}
/* If we need to request more space for this child to fill
for (row = child->top_attach; row < child->bottom_attach; row++)
{
- if (table->rows[row].expand)
+ if (priv->rows[row].expand)
n_expand++;
}
}
for (row = child->top_attach; row < child->bottom_attach; row++)
- if (force_expand || table->rows[row].expand)
+ if (force_expand || priv->rows[row].expand)
{
extra = height / n_expand;
- table->rows[row].requisition += extra;
+ priv->rows[row].requisition += extra;
height -= extra;
n_expand--;
}
static void
gtk_table_size_allocate_init (GtkTable *table)
{
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint row, col;
* Those values are modified by the children that occupy
* the rows and cols.
*/
- for (col = 0; col < table->ncols; col++)
+ for (col = 0; col < priv->ncols; col++)
{
- table->cols[col].allocation = table->cols[col].requisition;
- table->cols[col].need_expand = FALSE;
- table->cols[col].need_shrink = TRUE;
- table->cols[col].expand = FALSE;
- table->cols[col].shrink = TRUE;
- table->cols[col].empty = TRUE;
+ priv->cols[col].allocation = priv->cols[col].requisition;
+ priv->cols[col].need_expand = FALSE;
+ priv->cols[col].need_shrink = TRUE;
+ priv->cols[col].expand = FALSE;
+ priv->cols[col].shrink = TRUE;
+ priv->cols[col].empty = TRUE;
}
- for (row = 0; row < table->nrows; row++)
+ for (row = 0; row < priv->nrows; row++)
{
- table->rows[row].allocation = table->rows[row].requisition;
- table->rows[row].need_expand = FALSE;
- table->rows[row].need_shrink = TRUE;
- table->rows[row].expand = FALSE;
- table->rows[row].shrink = TRUE;
- table->rows[row].empty = TRUE;
+ priv->rows[row].allocation = priv->rows[row].requisition;
+ priv->rows[row].need_expand = FALSE;
+ priv->rows[row].need_shrink = TRUE;
+ priv->rows[row].expand = FALSE;
+ priv->rows[row].shrink = TRUE;
+ priv->rows[row].empty = TRUE;
}
/* Loop over all the children and adjust the row and col values
* or shrink. This loop handles children that occupy a single
* row or column.
*/
- children = table->children;
+ children = priv->children;
while (children)
{
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
if (child->left_attach == (child->right_attach - 1))
{
- if (child->xexpand)
- table->cols[child->left_attach].expand = TRUE;
-
+ if (child->xexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_HORIZONTAL))
+ priv->cols[child->left_attach].expand = TRUE;
+
if (!child->xshrink)
- table->cols[child->left_attach].shrink = FALSE;
-
- table->cols[child->left_attach].empty = FALSE;
+ priv->cols[child->left_attach].shrink = FALSE;
+
+ priv->cols[child->left_attach].empty = FALSE;
}
if (child->top_attach == (child->bottom_attach - 1))
{
- if (child->yexpand)
- table->rows[child->top_attach].expand = TRUE;
+ if (child->yexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_VERTICAL))
+ priv->rows[child->top_attach].expand = TRUE;
if (!child->yshrink)
- table->rows[child->top_attach].shrink = FALSE;
+ priv->rows[child->top_attach].shrink = FALSE;
- table->rows[child->top_attach].empty = FALSE;
+ priv->rows[child->top_attach].empty = FALSE;
}
}
}
/* Loop over all the children again and this time handle children
* which span multiple rows or columns.
*/
- children = table->children;
+ children = priv->children;
while (children)
{
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
if (child->left_attach != (child->right_attach - 1))
{
for (col = child->left_attach; col < child->right_attach; col++)
- table->cols[col].empty = FALSE;
+ priv->cols[col].empty = FALSE;
if (child->xexpand)
{
has_expand = FALSE;
for (col = child->left_attach; col < child->right_attach; col++)
- if (table->cols[col].expand)
+ if (priv->cols[col].expand)
{
has_expand = TRUE;
break;
if (!has_expand)
for (col = child->left_attach; col < child->right_attach; col++)
- table->cols[col].need_expand = TRUE;
+ priv->cols[col].need_expand = TRUE;
}
if (!child->xshrink)
{
has_shrink = TRUE;
for (col = child->left_attach; col < child->right_attach; col++)
- if (!table->cols[col].shrink)
+ if (!priv->cols[col].shrink)
{
has_shrink = FALSE;
break;
if (has_shrink)
for (col = child->left_attach; col < child->right_attach; col++)
- table->cols[col].need_shrink = FALSE;
+ priv->cols[col].need_shrink = FALSE;
}
}
if (child->top_attach != (child->bottom_attach - 1))
{
for (row = child->top_attach; row < child->bottom_attach; row++)
- table->rows[row].empty = FALSE;
+ priv->rows[row].empty = FALSE;
if (child->yexpand)
{
has_expand = FALSE;
for (row = child->top_attach; row < child->bottom_attach; row++)
- if (table->rows[row].expand)
+ if (priv->rows[row].expand)
{
has_expand = TRUE;
break;
if (!has_expand)
for (row = child->top_attach; row < child->bottom_attach; row++)
- table->rows[row].need_expand = TRUE;
+ priv->rows[row].need_expand = TRUE;
}
if (!child->yshrink)
{
has_shrink = TRUE;
for (row = child->top_attach; row < child->bottom_attach; row++)
- if (!table->rows[row].shrink)
+ if (!priv->rows[row].shrink)
{
has_shrink = FALSE;
break;
if (has_shrink)
for (row = child->top_attach; row < child->bottom_attach; row++)
- table->rows[row].need_shrink = FALSE;
+ priv->rows[row].need_shrink = FALSE;
}
}
}
/* Loop over the columns and set the expand and shrink values
* if the column can be expanded or shrunk.
*/
- for (col = 0; col < table->ncols; col++)
+ for (col = 0; col < priv->ncols; col++)
{
- if (table->cols[col].empty)
+ if (priv->cols[col].empty)
{
- table->cols[col].expand = FALSE;
- table->cols[col].shrink = FALSE;
+ priv->cols[col].expand = FALSE;
+ priv->cols[col].shrink = FALSE;
}
else
{
- if (table->cols[col].need_expand)
- table->cols[col].expand = TRUE;
- if (!table->cols[col].need_shrink)
- table->cols[col].shrink = FALSE;
+ if (priv->cols[col].need_expand)
+ priv->cols[col].expand = TRUE;
+ if (!priv->cols[col].need_shrink)
+ priv->cols[col].shrink = FALSE;
}
}
/* Loop over the rows and set the expand and shrink values
* if the row can be expanded or shrunk.
*/
- for (row = 0; row < table->nrows; row++)
+ for (row = 0; row < priv->nrows; row++)
{
- if (table->rows[row].empty)
+ if (priv->rows[row].empty)
{
- table->rows[row].expand = FALSE;
- table->rows[row].shrink = FALSE;
+ priv->rows[row].expand = FALSE;
+ priv->rows[row].shrink = FALSE;
}
else
{
- if (table->rows[row].need_expand)
- table->rows[row].expand = TRUE;
- if (!table->rows[row].need_shrink)
- table->rows[row].shrink = FALSE;
+ if (priv->rows[row].need_expand)
+ priv->rows[row].expand = TRUE;
+ if (!priv->rows[row].need_shrink)
+ priv->rows[row].shrink = FALSE;
}
}
}
static void
gtk_table_size_allocate_pass1 (GtkTable *table)
{
+ GtkTablePrivate *priv = table->priv;
+ GtkAllocation allocation;
gint real_width;
gint real_height;
gint width, height;
gint nexpand;
gint nshrink;
gint extra;
-
+
/* If we were allocated more space than we requested
* then we have to expand any expandable rows and columns
* to fill in the extra space.
*/
-
- real_width = GTK_WIDGET (table)->allocation.width - GTK_CONTAINER (table)->border_width * 2;
- real_height = GTK_WIDGET (table)->allocation.height - GTK_CONTAINER (table)->border_width * 2;
-
- if (table->homogeneous)
+ gtk_widget_get_allocation (GTK_WIDGET (table), &allocation);
+ real_width = allocation.width;
+ real_height = allocation.height;
+
+ if (priv->homogeneous)
{
- if (!table->children)
+ if (!priv->children)
nexpand = 1;
else
{
nexpand = 0;
- for (col = 0; col < table->ncols; col++)
- if (table->cols[col].expand)
+ for (col = 0; col < priv->ncols; col++)
+ if (priv->cols[col].expand)
{
nexpand += 1;
break;
if (nexpand)
{
width = real_width;
- for (col = 0; col + 1 < table->ncols; col++)
- width -= table->cols[col].spacing;
-
- for (col = 0; col < table->ncols; col++)
+ for (col = 0; col + 1 < priv->ncols; col++)
+ width -= priv->cols[col].spacing;
+
+ for (col = 0; col < priv->ncols; col++)
{
- extra = width / (table->ncols - col);
- table->cols[col].allocation = MAX (1, extra);
+ extra = width / (priv->ncols - col);
+ priv->cols[col].allocation = MAX (1, extra);
width -= extra;
}
}
width = 0;
nexpand = 0;
nshrink = 0;
-
- for (col = 0; col < table->ncols; col++)
+
+ for (col = 0; col < priv->ncols; col++)
{
- width += table->cols[col].requisition;
- if (table->cols[col].expand)
+ width += priv->cols[col].requisition;
+ if (priv->cols[col].expand)
nexpand += 1;
- if (table->cols[col].shrink)
+ if (priv->cols[col].shrink)
nshrink += 1;
}
- for (col = 0; col + 1 < table->ncols; col++)
- width += table->cols[col].spacing;
-
+ for (col = 0; col + 1 < priv->ncols; col++)
+ width += priv->cols[col].spacing;
+
/* Check to see if we were allocated more width than we requested.
*/
if ((width < real_width) && (nexpand >= 1))
{
width = real_width - width;
-
- for (col = 0; col < table->ncols; col++)
- if (table->cols[col].expand)
+
+ for (col = 0; col < priv->ncols; col++)
+ if (priv->cols[col].expand)
{
extra = width / nexpand;
- table->cols[col].allocation += extra;
-
+ priv->cols[col].allocation += extra;
+
width -= extra;
nexpand -= 1;
}
while (total_nshrink > 0 && extra > 0)
{
nshrink = total_nshrink;
- for (col = 0; col < table->ncols; col++)
- if (table->cols[col].shrink)
+ for (col = 0; col < priv->ncols; col++)
+ if (priv->cols[col].shrink)
{
- gint allocation = table->cols[col].allocation;
+ gint allocation = priv->cols[col].allocation;
- table->cols[col].allocation = MAX (1, (gint) table->cols[col].allocation - extra / nshrink);
- extra -= allocation - table->cols[col].allocation;
+ priv->cols[col].allocation = MAX (1, (gint) priv->cols[col].allocation - extra / nshrink);
+ extra -= allocation - priv->cols[col].allocation;
nshrink -= 1;
- if (table->cols[col].allocation < 2)
+ if (priv->cols[col].allocation < 2)
{
total_nshrink -= 1;
- table->cols[col].shrink = FALSE;
+ priv->cols[col].shrink = FALSE;
}
}
}
}
}
-
- if (table->homogeneous)
+
+ if (priv->homogeneous)
{
- if (!table->children)
+ if (!priv->children)
nexpand = 1;
else
{
nexpand = 0;
- for (row = 0; row < table->nrows; row++)
- if (table->rows[row].expand)
+ for (row = 0; row < priv->nrows; row++)
+ if (priv->rows[row].expand)
{
nexpand += 1;
break;
if (nexpand)
{
height = real_height;
-
- for (row = 0; row + 1 < table->nrows; row++)
- height -= table->rows[row].spacing;
-
-
- for (row = 0; row < table->nrows; row++)
+
+ for (row = 0; row + 1 < priv->nrows; row++)
+ height -= priv->rows[row].spacing;
+
+ for (row = 0; row < priv->nrows; row++)
{
- extra = height / (table->nrows - row);
- table->rows[row].allocation = MAX (1, extra);
+ extra = height / (priv->nrows - row);
+ priv->rows[row].allocation = MAX (1, extra);
height -= extra;
}
}
height = 0;
nexpand = 0;
nshrink = 0;
-
- for (row = 0; row < table->nrows; row++)
+
+ for (row = 0; row < priv->nrows; row++)
{
- height += table->rows[row].requisition;
- if (table->rows[row].expand)
+ height += priv->rows[row].requisition;
+ if (priv->rows[row].expand)
nexpand += 1;
- if (table->rows[row].shrink)
+ if (priv->rows[row].shrink)
nshrink += 1;
}
- for (row = 0; row + 1 < table->nrows; row++)
- height += table->rows[row].spacing;
-
+ for (row = 0; row + 1 < priv->nrows; row++)
+ height += priv->rows[row].spacing;
+
/* Check to see if we were allocated more height than we requested.
*/
if ((height < real_height) && (nexpand >= 1))
{
height = real_height - height;
-
- for (row = 0; row < table->nrows; row++)
- if (table->rows[row].expand)
+
+ for (row = 0; row < priv->nrows; row++)
+ if (priv->rows[row].expand)
{
extra = height / nexpand;
- table->rows[row].allocation += extra;
-
+ priv->rows[row].allocation += extra;
+
height -= extra;
nexpand -= 1;
}
while (total_nshrink > 0 && extra > 0)
{
nshrink = total_nshrink;
- for (row = 0; row < table->nrows; row++)
- if (table->rows[row].shrink)
+ for (row = 0; row < priv->nrows; row++)
+ if (priv->rows[row].shrink)
{
- gint allocation = table->rows[row].allocation;
-
- table->rows[row].allocation = MAX (1, (gint) table->rows[row].allocation - extra / nshrink);
- extra -= allocation - table->rows[row].allocation;
+ gint allocation = priv->rows[row].allocation;
+
+ priv->rows[row].allocation = MAX (1, (gint) priv->rows[row].allocation - extra / nshrink);
+ extra -= allocation - priv->rows[row].allocation;
nshrink -= 1;
- if (table->rows[row].allocation < 2)
+ if (priv->rows[row].allocation < 2)
{
total_nshrink -= 1;
- table->rows[row].shrink = FALSE;
+ priv->rows[row].shrink = FALSE;
}
}
}
static void
gtk_table_size_allocate_pass2 (GtkTable *table)
{
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint max_width;
gint x, y;
gint row, col;
GtkAllocation allocation;
+ GtkAllocation table_allocation, widget_allocation;
GtkWidget *widget = GTK_WIDGET (table);
-
- children = table->children;
+
+ children = priv->children;
while (children)
{
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
GtkRequisition child_requisition;
- gtk_widget_get_child_requisition (child->widget, &child_requisition);
- x = GTK_WIDGET (table)->allocation.x + GTK_CONTAINER (table)->border_width;
- y = GTK_WIDGET (table)->allocation.y + GTK_CONTAINER (table)->border_width;
+ gtk_widget_get_preferred_size (child->widget,
+ &child_requisition, NULL);
+
+ gtk_widget_get_allocation (GTK_WIDGET (table), &table_allocation);
+ x = table_allocation.x;
+ y = table_allocation.y;
max_width = 0;
max_height = 0;
for (col = 0; col < child->left_attach; col++)
{
- x += table->cols[col].allocation;
- x += table->cols[col].spacing;
+ x += priv->cols[col].allocation;
+ x += priv->cols[col].spacing;
}
for (col = child->left_attach; col < child->right_attach; col++)
{
- max_width += table->cols[col].allocation;
+ max_width += priv->cols[col].allocation;
if ((col + 1) < child->right_attach)
- max_width += table->cols[col].spacing;
+ max_width += priv->cols[col].spacing;
}
for (row = 0; row < child->top_attach; row++)
{
- y += table->rows[row].allocation;
- y += table->rows[row].spacing;
+ y += priv->rows[row].allocation;
+ y += priv->rows[row].spacing;
}
for (row = child->top_attach; row < child->bottom_attach; row++)
{
- max_height += table->rows[row].allocation;
+ max_height += priv->rows[row].allocation;
if ((row + 1) < child->bottom_attach)
- max_height += table->rows[row].spacing;
+ max_height += priv->rows[row].spacing;
}
if (child->xfill)
allocation.y = y + (max_height - allocation.height) / 2;
}
+ gtk_widget_get_allocation (widget, &widget_allocation);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- allocation.x = widget->allocation.x + widget->allocation.width
- - (allocation.x - widget->allocation.x) - allocation.width;
-
+ allocation.x = widget_allocation.x + widget_allocation.width
+ - (allocation.x - widget_allocation.x) - allocation.width;
+
gtk_widget_size_allocate (child->widget, &allocation);
}
}
}
-
-#define __GTK_TABLE_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff