X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkalignment.c;h=ddd627ce86695a64dc262cfbc7bb0ec8809ad5a8;hb=HEAD;hp=ec633c506469ef4b60ce14ccc389eb0128c355f7;hpb=263bce4445987c0ffee10438464106d55458f85e;p=~andy%2Fgtk
diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index ec633c506..ddd627ce8 100644
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
@@ -24,11 +22,53 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include
-#include "gtkalias.h"
+/**
+ * SECTION:gtkalignment
+ * @Short_description: A widget which controls the alignment and size of its child
+ * @Title: GtkAlignment
+ *
+ * The #GtkAlignment widget controls the alignment and size of its child widget.
+ * It has four settings: xscale, yscale, xalign, and yalign.
+ *
+ * The scale settings are used to specify how much the child widget should
+ * expand to fill the space allocated to the #GtkAlignment.
+ * The values can range from 0 (meaning the child doesn't expand at all) to
+ * 1 (meaning the child expands to fill all of the available space).
+ *
+ * The align settings are used to place the child widget within the available
+ * area. The values range from 0 (top or left) to 1 (bottom or right).
+ * Of course, if the scale settings are both set to 1, the alignment settings
+ * have no effect.
+ *
+ *
+ *
+ * Note that the desired effect can in most cases be achieved by using the
+ * #GtkWidget:halign, #GtkWidget:valign and #GtkWidget:margin properties
+ * on the child widget, so #GtkAlignment should not be used in new code.
+ *
+ *
+ */
+
+#include "config.h"
#include "gtkalignment.h"
+#include "gtksizerequest.h"
+#include "gtkprivate.h"
#include "gtkintl.h"
+
+struct _GtkAlignmentPrivate
+{
+ gfloat xalign;
+ gfloat yalign;
+ gfloat xscale;
+ gfloat yscale;
+
+ guint padding_bottom;
+ guint padding_top;
+ guint padding_left;
+ guint padding_right;
+};
+
enum {
PROP_0,
@@ -40,25 +80,9 @@ enum {
PROP_TOP_PADDING,
PROP_BOTTOM_PADDING,
PROP_LEFT_PADDING,
- PROP_RIGHT_PADDING,
-
- PROP_LAST
-};
-
-#define GTK_ALIGNMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ALIGNMENT, GtkAlignmentPrivate))
-
-struct _GtkAlignmentPrivate
-{
- guint padding_top;
- guint padding_bottom;
- guint padding_left;
- guint padding_right;
+ PROP_RIGHT_PADDING
};
-static void gtk_alignment_class_init (GtkAlignmentClass *klass);
-static void gtk_alignment_init (GtkAlignment *alignment);
-static void gtk_alignment_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
static void gtk_alignment_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_alignment_set_property (GObject *object,
@@ -70,32 +94,22 @@ static void gtk_alignment_get_property (GObject *object,
GValue *value,
GParamSpec *pspec);
-GType
-gtk_alignment_get_type (void)
-{
- static GType alignment_type = 0;
-
- if (!alignment_type)
- {
- static const GTypeInfo alignment_info =
- {
- sizeof (GtkAlignmentClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_alignment_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkAlignment),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_alignment_init,
- };
-
- alignment_type = g_type_register_static (GTK_TYPE_BIN, "GtkAlignment",
- &alignment_info, 0);
- }
-
- return alignment_type;
-}
+static void gtk_alignment_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_alignment_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_alignment_get_preferred_width_for_height (GtkWidget *widget,
+ gint for_size,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_alignment_get_preferred_height_for_width (GtkWidget *widget,
+ gint for_size,
+ gint *minimum_size,
+ gint *natural_size);
+
+G_DEFINE_TYPE (GtkAlignment, gtk_alignment, GTK_TYPE_BIN)
static void
gtk_alignment_class_init (GtkAlignmentClass *class)
@@ -109,8 +123,11 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
gobject_class->set_property = gtk_alignment_set_property;
gobject_class->get_property = gtk_alignment_get_property;
- widget_class->size_request = gtk_alignment_size_request;
- widget_class->size_allocate = gtk_alignment_size_allocate;
+ widget_class->size_allocate = gtk_alignment_size_allocate;
+ widget_class->get_preferred_width = gtk_alignment_get_preferred_width;
+ widget_class->get_preferred_height = gtk_alignment_get_preferred_height;
+ widget_class->get_preferred_width_for_height = gtk_alignment_get_preferred_width_for_height;
+ widget_class->get_preferred_height_for_width = gtk_alignment_get_preferred_height_for_width;
g_object_class_install_property (gobject_class,
PROP_XALIGN,
@@ -120,7 +137,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
0.5,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_YALIGN,
@@ -130,7 +147,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
0.5,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_XSCALE,
g_param_spec_float("xscale",
@@ -139,7 +156,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
1.0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_YSCALE,
g_param_spec_float("yscale",
@@ -148,7 +165,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
1.0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
/**
@@ -166,10 +183,10 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
/**
- * GtkAlignment:top-padding:
+ * GtkAlignment:bottom-padding:
*
* The padding to insert at the bottom of the widget.
*
@@ -183,10 +200,10 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
/**
- * GtkAlignment:top-padding:
+ * GtkAlignment:left-padding:
*
* The padding to insert at the left of the widget.
*
@@ -200,10 +217,10 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
/**
- * GtkAlignment:top-padding:
+ * GtkAlignment:right-padding:
*
* The padding to insert at the right of the widget.
*
@@ -217,32 +234,54 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
- g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPrivate));
+ g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPrivate));
}
static void
gtk_alignment_init (GtkAlignment *alignment)
{
GtkAlignmentPrivate *priv;
-
- GTK_WIDGET_SET_FLAGS (alignment, GTK_NO_WINDOW);
+
+ alignment->priv = G_TYPE_INSTANCE_GET_PRIVATE (alignment,
+ GTK_TYPE_ALIGNMENT,
+ GtkAlignmentPrivate);
+ priv = alignment->priv;
+
+ gtk_widget_set_has_window (GTK_WIDGET (alignment), FALSE);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (alignment), FALSE);
- alignment->xalign = 0.5;
- alignment->yalign = 0.5;
- alignment->xscale = 1.0;
- alignment->yscale = 1.0;
+ priv->xalign = 0.5;
+ priv->yalign = 0.5;
+ priv->xscale = 1.0;
+ priv->yscale = 1.0;
/* Initialize padding with default values: */
- priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
priv->padding_top = 0;
priv->padding_bottom = 0;
priv->padding_left = 0;
priv->padding_right = 0;
}
+/**
+ * gtk_alignment_new:
+ * @xalign: the horizontal alignment of the child widget, from 0 (left) to 1
+ * (right).
+ * @yalign: the vertical alignment of the child widget, from 0 (top) to 1
+ * (bottom).
+ * @xscale: the amount that the child widget expands horizontally to fill up
+ * unused space, from 0 to 1.
+ * A value of 0 indicates that the child widget should never expand.
+ * A value of 1 indicates that the child widget will expand to fill all of the
+ * space allocated for the #GtkAlignment.
+ * @yscale: the amount that the child widget expands vertically to fill up
+ * unused space, from 0 to 1. The values are similar to @xscale.
+ *
+ * Creates a new #GtkAlignment.
+ *
+ * Returns: the new #GtkAlignment.
+ */
GtkWidget*
gtk_alignment_new (gfloat xalign,
gfloat yalign,
@@ -250,13 +289,16 @@ gtk_alignment_new (gfloat xalign,
gfloat yscale)
{
GtkAlignment *alignment;
+ GtkAlignmentPrivate *priv;
alignment = g_object_new (GTK_TYPE_ALIGNMENT, NULL);
- alignment->xalign = CLAMP (xalign, 0.0, 1.0);
- alignment->yalign = CLAMP (yalign, 0.0, 1.0);
- alignment->xscale = CLAMP (xscale, 0.0, 1.0);
- alignment->yscale = CLAMP (yscale, 0.0, 1.0);
+ priv = alignment->priv;
+
+ priv->xalign = CLAMP (xalign, 0.0, 1.0);
+ priv->yalign = CLAMP (yalign, 0.0, 1.0);
+ priv->xscale = CLAMP (xscale, 0.0, 1.0);
+ priv->yscale = CLAMP (yscale, 0.0, 1.0);
return GTK_WIDGET (alignment);
}
@@ -267,40 +309,37 @@ gtk_alignment_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- GtkAlignment *alignment;
- GtkAlignmentPrivate *priv;
-
- alignment = GTK_ALIGNMENT (object);
- priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
-
+ GtkAlignment *alignment = GTK_ALIGNMENT (object);
+ GtkAlignmentPrivate *priv = alignment->priv;
+
switch (prop_id)
{
case PROP_XALIGN:
gtk_alignment_set (alignment,
g_value_get_float (value),
- alignment->yalign,
- alignment->xscale,
- alignment->yscale);
+ priv->yalign,
+ priv->xscale,
+ priv->yscale);
break;
case PROP_YALIGN:
gtk_alignment_set (alignment,
- alignment->xalign,
+ priv->xalign,
g_value_get_float (value),
- alignment->xscale,
- alignment->yscale);
+ priv->xscale,
+ priv->yscale);
break;
case PROP_XSCALE:
gtk_alignment_set (alignment,
- alignment->xalign,
- alignment->yalign,
+ priv->xalign,
+ priv->yalign,
g_value_get_float (value),
- alignment->yscale);
+ priv->yscale);
break;
case PROP_YSCALE:
gtk_alignment_set (alignment,
- alignment->xalign,
- alignment->yalign,
- alignment->xscale,
+ priv->xalign,
+ priv->yalign,
+ priv->xscale,
g_value_get_float (value));
break;
@@ -346,25 +385,22 @@ gtk_alignment_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- GtkAlignment *alignment;
- GtkAlignmentPrivate *priv;
+ GtkAlignment *alignment = GTK_ALIGNMENT (object);
+ GtkAlignmentPrivate *priv = alignment->priv;
- alignment = GTK_ALIGNMENT (object);
- priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
-
switch (prop_id)
{
case PROP_XALIGN:
- g_value_set_float(value, alignment->xalign);
+ g_value_set_float(value, priv->xalign);
break;
case PROP_YALIGN:
- g_value_set_float(value, alignment->yalign);
+ g_value_set_float(value, priv->yalign);
break;
case PROP_XSCALE:
- g_value_set_float(value, alignment->xscale);
+ g_value_set_float(value, priv->xscale);
break;
case PROP_YSCALE:
- g_value_set_float(value, alignment->yscale);
+ g_value_set_float(value, priv->yscale);
break;
/* Padding: */
@@ -387,6 +423,23 @@ gtk_alignment_get_property (GObject *object,
}
}
+/**
+ * gtk_alignment_set:
+ * @alignment: a #GtkAlignment.
+ * @xalign: the horizontal alignment of the child widget, from 0 (left) to 1
+ * (right).
+ * @yalign: the vertical alignment of the child widget, from 0 (top) to 1
+ * (bottom).
+ * @xscale: the amount that the child widget expands horizontally to fill up
+ * unused space, from 0 to 1.
+ * A value of 0 indicates that the child widget should never expand.
+ * A value of 1 indicates that the child widget will expand to fill all of the
+ * space allocated for the #GtkAlignment.
+ * @yscale: the amount that the child widget expands vertically to fill up
+ * unused space, from 0 to 1. The values are similar to @xscale.
+ *
+ * Sets the #GtkAlignment values.
+ */
void
gtk_alignment_set (GtkAlignment *alignment,
gfloat xalign,
@@ -394,137 +447,245 @@ gtk_alignment_set (GtkAlignment *alignment,
gfloat xscale,
gfloat yscale)
{
+ GtkAlignmentPrivate *priv;
+ GtkWidget *child;
+
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
+ priv = alignment->priv;
+
xalign = CLAMP (xalign, 0.0, 1.0);
yalign = CLAMP (yalign, 0.0, 1.0);
xscale = CLAMP (xscale, 0.0, 1.0);
yscale = CLAMP (yscale, 0.0, 1.0);
- if ( (alignment->xalign != xalign)
- || (alignment->yalign != yalign)
- || (alignment->xscale != xscale)
- || (alignment->yscale != yscale))
+ if ( (priv->xalign != xalign)
+ || (priv->yalign != yalign)
+ || (priv->xscale != xscale)
+ || (priv->yscale != yscale))
{
g_object_freeze_notify (G_OBJECT (alignment));
- if (alignment->xalign != xalign)
+ if (priv->xalign != xalign)
{
- alignment->xalign = xalign;
+ priv->xalign = xalign;
g_object_notify (G_OBJECT (alignment), "xalign");
}
- if (alignment->yalign != yalign)
+ if (priv->yalign != yalign)
{
- alignment->yalign = yalign;
+ priv->yalign = yalign;
g_object_notify (G_OBJECT (alignment), "yalign");
}
- if (alignment->xscale != xscale)
+ if (priv->xscale != xscale)
{
- alignment->xscale = xscale;
+ priv->xscale = xscale;
g_object_notify (G_OBJECT (alignment), "xscale");
}
- if (alignment->yscale != yscale)
+ if (priv->yscale != yscale)
{
- alignment->yscale = yscale;
+ priv->yscale = yscale;
g_object_notify (G_OBJECT (alignment), "yscale");
}
g_object_thaw_notify (G_OBJECT (alignment));
- if (GTK_BIN (alignment)->child)
- gtk_widget_queue_resize (GTK_BIN (alignment)->child);
+ child = gtk_bin_get_child (GTK_BIN (alignment));
+ if (child)
+ gtk_widget_queue_resize (child);
gtk_widget_queue_draw (GTK_WIDGET (alignment));
}
}
-static void
-gtk_alignment_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- GtkAlignment *alignment;
- GtkBin *bin;
- GtkAlignmentPrivate *priv;
-
- alignment = GTK_ALIGNMENT (widget);
- bin = GTK_BIN (widget);
- priv = GTK_ALIGNMENT_GET_PRIVATE (widget);
-
- requisition->width = GTK_CONTAINER (widget)->border_width * 2;
- requisition->height = GTK_CONTAINER (widget)->border_width * 2;
-
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
- {
- GtkRequisition child_requisition;
-
- gtk_widget_size_request (bin->child, &child_requisition);
-
- requisition->width += child_requisition.width;
- requisition->height += child_requisition.height;
-
- /* Request extra space for the padding: */
- requisition->width += (priv->padding_left + priv->padding_right);
- requisition->height += (priv->padding_top + priv->padding_bottom);
- }
-}
-
static void
gtk_alignment_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkAlignment *alignment;
+ GtkAlignment *alignment = GTK_ALIGNMENT (widget);
+ GtkAlignmentPrivate *priv = alignment->priv;
GtkBin *bin;
GtkAllocation child_allocation;
- GtkRequisition child_requisition;
+ GtkWidget *child;
gint width, height;
- gint border_width;
+ guint border_width;
gint padding_horizontal, padding_vertical;
- GtkAlignmentPrivate *priv;
- gfloat xalign;
padding_horizontal = 0;
padding_vertical = 0;
- widget->allocation = *allocation;
- alignment = GTK_ALIGNMENT (widget);
+ gtk_widget_set_allocation (widget, allocation);
bin = GTK_BIN (widget);
-
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
{
- gtk_widget_get_child_requisition (bin->child, &child_requisition);
+ gint child_nat_width;
+ gint child_nat_height;
+ gint child_width, child_height;
- border_width = GTK_CONTAINER (alignment)->border_width;
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (alignment));
- priv = GTK_ALIGNMENT_GET_PRIVATE (widget);
padding_horizontal = priv->padding_left + priv->padding_right;
padding_vertical = priv->padding_top + priv->padding_bottom;
- width = allocation->width - padding_horizontal - 2 * border_width;
- height = allocation->height - padding_vertical - 2 * border_width;
-
- if (width > child_requisition.width)
- child_allocation.width = (child_requisition.width *
- (1.0 - alignment->xscale) +
- width * alignment->xscale);
+ width = MAX (1, allocation->width - padding_horizontal - 2 * border_width);
+ height = MAX (1, allocation->height - padding_vertical - 2 * border_width);
+
+ if (gtk_widget_get_request_mode (child) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
+ {
+ gtk_widget_get_preferred_width (child, NULL, &child_nat_width);
+
+ child_width = MIN (width, child_nat_width);
+
+ gtk_widget_get_preferred_height_for_width (child, child_width, NULL, &child_nat_height);
+
+ child_height = MIN (height, child_nat_height);
+ }
+ else
+ {
+ gtk_widget_get_preferred_height (child, NULL, &child_nat_height);
+
+ child_height = MIN (height, child_nat_height);
+
+ gtk_widget_get_preferred_width_for_height (child, child_height, NULL, &child_nat_width);
+
+ child_width = MIN (width, child_nat_width);
+ }
+
+ if (width > child_width)
+ child_allocation.width = (child_width *
+ (1.0 - priv->xscale) +
+ width * priv->xscale);
else
child_allocation.width = width;
-
- if (height > child_requisition.height)
- child_allocation.height = (child_requisition.height *
- (1.0 - alignment->yscale) +
- height * alignment->yscale);
+
+ if (height > child_height)
+ child_allocation.height = (child_height *
+ (1.0 - priv->yscale) +
+ height * priv->yscale);
else
child_allocation.height = height;
- xalign = alignment->xalign;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- xalign = 1.0 - xalign;
+ child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + border_width + priv->padding_right;
+ else
+ child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left;
- child_allocation.x = xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left;
- child_allocation.y = alignment->yalign * (height - child_allocation.height) + allocation->y + border_width + priv->padding_top;
+ child_allocation.y = priv->yalign * (height - child_allocation.height) + allocation->y + border_width + priv->padding_top;
- gtk_widget_size_allocate (bin->child, &child_allocation);
+ gtk_widget_size_allocate (child, &child_allocation);
}
}
+
+static void
+gtk_alignment_get_preferred_size (GtkWidget *widget,
+ GtkOrientation orientation,
+ gint for_size,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkAlignment *alignment = GTK_ALIGNMENT (widget);
+ GtkAlignmentPrivate *priv = alignment->priv;
+ GtkWidget *child;
+ guint minimum, natural;
+
+ natural = minimum = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
+
+ if ((child = gtk_bin_get_child (GTK_BIN (widget))) && gtk_widget_get_visible (child))
+ {
+ gint child_min, child_nat;
+
+ /* Request extra space for the padding: */
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ minimum += (priv->padding_left + priv->padding_right);
+
+ if (for_size < 0)
+ gtk_widget_get_preferred_width (child, &child_min, &child_nat);
+ else
+ {
+ gint min_height;
+
+ gtk_widget_get_preferred_height (child, &min_height, NULL);
+
+ for_size -= (priv->padding_top + priv->padding_bottom);
+
+ if (for_size > min_height)
+ for_size = (min_height * (1.0 - priv->yscale) +
+ for_size * priv->yscale);
+
+ gtk_widget_get_preferred_width_for_height (child, for_size, &child_min, &child_nat);
+ }
+ }
+ else
+ {
+ minimum += (priv->padding_top + priv->padding_bottom);
+
+ if (for_size < 0)
+ gtk_widget_get_preferred_height (child, &child_min, &child_nat);
+ else
+ {
+ gint min_width;
+
+ gtk_widget_get_preferred_width (child, &min_width, NULL);
+
+ for_size -= (priv->padding_left + priv->padding_right);
+
+ if (for_size > min_width)
+ for_size = (min_width * (1.0 - priv->xscale) +
+ for_size * priv->xscale);
+
+ gtk_widget_get_preferred_height_for_width (child, for_size, &child_min, &child_nat);
+ }
+ }
+
+ natural = minimum;
+
+ minimum += child_min;
+ natural += child_nat;
+ }
+
+ if (minimum_size)
+ *minimum_size = minimum;
+
+ if (natural_size)
+ *natural_size = natural;
+}
+
+static void
+gtk_alignment_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum_size, natural_size);
+}
+
+static void
+gtk_alignment_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, -1, minimum_size, natural_size);
+}
+
+
+static void
+gtk_alignment_get_preferred_width_for_height (GtkWidget *widget,
+ gint for_size,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, for_size, minimum_size, natural_size);
+}
+
+static void
+gtk_alignment_get_preferred_height_for_width (GtkWidget *widget,
+ gint for_size,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum_size, natural_size);
+}
+
/**
* gtk_alignment_set_padding:
* @alignment: a #GtkAlignment
@@ -548,39 +709,41 @@ gtk_alignment_set_padding (GtkAlignment *alignment,
guint padding_right)
{
GtkAlignmentPrivate *priv;
+ GtkWidget *child;
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
- priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
+ priv = alignment->priv;
g_object_freeze_notify (G_OBJECT (alignment));
if (priv->padding_top != padding_top)
{
priv->padding_top = padding_top;
- g_object_notify (G_OBJECT (alignment), "top_padding");
+ g_object_notify (G_OBJECT (alignment), "top-padding");
}
if (priv->padding_bottom != padding_bottom)
{
priv->padding_bottom = padding_bottom;
- g_object_notify (G_OBJECT (alignment), "bottom_padding");
+ g_object_notify (G_OBJECT (alignment), "bottom-padding");
}
if (priv->padding_left != padding_left)
{
priv->padding_left = padding_left;
- g_object_notify (G_OBJECT (alignment), "left_padding");
+ g_object_notify (G_OBJECT (alignment), "left-padding");
}
if (priv->padding_right != padding_right)
{
priv->padding_right = padding_right;
- g_object_notify (G_OBJECT (alignment), "right_padding");
+ g_object_notify (G_OBJECT (alignment), "right-padding");
}
g_object_thaw_notify (G_OBJECT (alignment));
/* Make sure that the widget and children are redrawn with the new setting: */
- if (GTK_BIN (alignment)->child)
- gtk_widget_queue_resize (GTK_BIN (alignment)->child);
+ child = gtk_bin_get_child (GTK_BIN (alignment));
+ if (child)
+ gtk_widget_queue_resize (child);
gtk_widget_queue_draw (GTK_WIDGET (alignment));
}
@@ -588,10 +751,14 @@ gtk_alignment_set_padding (GtkAlignment *alignment,
/**
* gtk_alignment_get_padding:
* @alignment: a #GtkAlignment
- * @padding_top: location to store the padding for the top of the widget, or %NULL
- * @padding_bottom: location to store the padding for the bottom of the widget, or %NULL
- * @padding_left: location to store the padding for the left of the widget, or %NULL
- * @padding_right: location to store the padding for the right of the widget, or %NULL
+ * @padding_top: (out) (allow-none): location to store the padding for
+ * the top of the widget, or %NULL
+ * @padding_bottom: (out) (allow-none): location to store the padding
+ * for the bottom of the widget, or %NULL
+ * @padding_left: (out) (allow-none): location to store the padding
+ * for the left of the widget, or %NULL
+ * @padding_right: (out) (allow-none): location to store the padding
+ * for the right of the widget, or %NULL
*
* Gets the padding on the different sides of the widget.
* See gtk_alignment_set_padding ().
@@ -606,10 +773,11 @@ gtk_alignment_get_padding (GtkAlignment *alignment,
guint *padding_right)
{
GtkAlignmentPrivate *priv;
-
+
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
- priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
+ priv = alignment->priv;
+
if(padding_top)
*padding_top = priv->padding_top;
if(padding_bottom)