* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gtkalignment.h"
+#include "gtkprivate.h"
#include "gtkintl.h"
+#include "gtkalias.h"
enum {
PROP_0,
PROP_YALIGN,
PROP_XSCALE,
PROP_YSCALE,
+
+ 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;
+};
static void gtk_alignment_class_init (GtkAlignmentClass *klass);
static void gtk_alignment_init (GtkAlignment *alignment);
GValue *value,
GParamSpec *pspec);
-GtkType
+GType
gtk_alignment_get_type (void)
{
- static GtkType alignment_type = 0;
+ static GType alignment_type = 0;
if (!alignment_type)
{
- static const GtkTypeInfo alignment_info =
+ static const GTypeInfo alignment_info =
{
- "GtkAlignment",
- sizeof (GtkAlignment),
sizeof (GtkAlignmentClass),
- (GtkClassInitFunc) gtk_alignment_class_init,
- (GtkObjectInitFunc) gtk_alignment_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ 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 = gtk_type_unique (GTK_TYPE_BIN, &alignment_info);
+ alignment_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkAlignment"),
+ &alignment_info, 0);
}
return alignment_type;
gtk_alignment_class_init (GtkAlignmentClass *class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
gobject_class = (GObjectClass*) class;
- object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
gobject_class->set_property = gtk_alignment_set_property;
widget_class->size_request = gtk_alignment_size_request;
widget_class->size_allocate = gtk_alignment_size_allocate;
-
+
g_object_class_install_property (gobject_class,
PROP_XALIGN,
g_param_spec_float("xalign",
- _("Horizontal alignment"),
- _("Value between 0.0 and 1.0 to indicate X alignment"),
+ P_("Horizontal alignment"),
+ P_("Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"),
0.0,
1.0,
0.5,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_YALIGN,
g_param_spec_float("yalign",
- _("Vertical alignment"),
- _("Value between 0.0 and 1.0 to indicate Y alignment"),
+ P_("Vertical alignment"),
+ P_("Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"),
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",
- _("Horizontal scale"),
- _("Value between 0.0 and 1.0 to indicate X scale"),
+ P_("Horizontal scale"),
+ P_("If available horizontal space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"),
0.0,
1.0,
- 0.5,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ 1.0,
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_YSCALE,
g_param_spec_float("yscale",
- _("Vertical scale"),
- _("Value between 0.0 and 1.0 to indicate Y scale"),
+ P_("Vertical scale"),
+ P_("If available vertical space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"),
0.0,
1.0,
- 0.5,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ 1.0,
+ GTK_PARAM_READWRITE));
+
+
+/**
+ * GtkAlignment:top-padding:
+ *
+ * The padding to insert at the top of the widget.
+ *
+ * Since: 2.4
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_TOP_PADDING,
+ g_param_spec_uint("top-padding",
+ P_("Top Padding"),
+ P_("The padding to insert at the top of the widget."),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
+
+/**
+ * GtkAlignment:bottom-padding:
+ *
+ * The padding to insert at the bottom of the widget.
+ *
+ * Since: 2.4
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_BOTTOM_PADDING,
+ g_param_spec_uint("bottom-padding",
+ P_("Bottom Padding"),
+ P_("The padding to insert at the bottom of the widget."),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
+
+/**
+ * GtkAlignment:left-padding:
+ *
+ * The padding to insert at the left of the widget.
+ *
+ * Since: 2.4
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_LEFT_PADDING,
+ g_param_spec_uint("left-padding",
+ P_("Left Padding"),
+ P_("The padding to insert at the left of the widget."),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
+
+/**
+ * GtkAlignment:right-padding:
+ *
+ * The padding to insert at the right of the widget.
+ *
+ * Since: 2.4
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_RIGHT_PADDING,
+ g_param_spec_uint("right-padding",
+ P_("Right Padding"),
+ P_("The padding to insert at the right of the widget."),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
+
+ 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);
+ 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;
+
+ /* 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;
}
GtkWidget*
{
GtkAlignment *alignment;
- alignment = gtk_type_new (gtk_alignment_get_type ());
+ alignment = g_object_new (GTK_TYPE_ALIGNMENT, NULL);
alignment->xalign = CLAMP (xalign, 0.0, 1.0);
alignment->yalign = CLAMP (yalign, 0.0, 1.0);
GParamSpec *pspec)
{
GtkAlignment *alignment;
+ GtkAlignmentPrivate *priv;
alignment = GTK_ALIGNMENT (object);
+ priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
switch (prop_id)
{
case PROP_XALIGN:
gtk_alignment_set (alignment,
- g_value_get_float(value),
+ g_value_get_float (value),
alignment->yalign,
alignment->xscale,
alignment->yscale);
case PROP_YALIGN:
gtk_alignment_set (alignment,
alignment->xalign,
- g_value_get_float(value),
+ g_value_get_float (value),
alignment->xscale,
alignment->yscale);
break;
gtk_alignment_set (alignment,
alignment->xalign,
alignment->yalign,
- g_value_get_float(value),
+ g_value_get_float (value),
alignment->yscale);
break;
case PROP_YSCALE:
alignment->xalign,
alignment->yalign,
alignment->xscale,
- g_value_get_float(value));
+ g_value_get_float (value));
+ break;
+
+ /* Padding: */
+ case PROP_TOP_PADDING:
+ gtk_alignment_set_padding (alignment,
+ g_value_get_uint (value),
+ priv->padding_bottom,
+ priv->padding_left,
+ priv->padding_right);
+ break;
+ case PROP_BOTTOM_PADDING:
+ gtk_alignment_set_padding (alignment,
+ priv->padding_top,
+ g_value_get_uint (value),
+ priv->padding_left,
+ priv->padding_right);
+ break;
+ case PROP_LEFT_PADDING:
+ gtk_alignment_set_padding (alignment,
+ priv->padding_top,
+ priv->padding_bottom,
+ g_value_get_uint (value),
+ priv->padding_right);
+ break;
+ case PROP_RIGHT_PADDING:
+ gtk_alignment_set_padding (alignment,
+ priv->padding_top,
+ priv->padding_bottom,
+ priv->padding_left,
+ g_value_get_uint (value));
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
GParamSpec *pspec)
{
GtkAlignment *alignment;
-
+ GtkAlignmentPrivate *priv;
+
alignment = GTK_ALIGNMENT (object);
+ priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
switch (prop_id)
{
case PROP_YSCALE:
g_value_set_float(value, alignment->yscale);
break;
+
+ /* Padding: */
+ case PROP_TOP_PADDING:
+ g_value_set_uint (value, priv->padding_top);
+ break;
+ case PROP_BOTTOM_PADDING:
+ g_value_set_uint (value, priv->padding_bottom);
+ break;
+ case PROP_LEFT_PADDING:
+ g_value_set_uint (value, priv->padding_left);
+ break;
+ case PROP_RIGHT_PADDING:
+ g_value_set_uint (value, priv->padding_right);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
gfloat xscale,
gfloat yscale)
{
- gboolean values_changed = FALSE;
-
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
xalign = CLAMP (xalign, 0.0, 1.0);
xscale = CLAMP (xscale, 0.0, 1.0);
yscale = CLAMP (yscale, 0.0, 1.0);
- if (alignment->xalign != xalign)
- {
- values_changed = TRUE;
- alignment->xalign = xalign;
- g_object_notify (G_OBJECT(alignment), "xalign");
- }
- if (alignment->yalign != yalign)
- {
- values_changed = TRUE;
- alignment->yalign = yalign;
- g_object_notify (G_OBJECT(alignment), "yalign");
- }
- if (alignment->xscale != xscale)
- {
- values_changed = TRUE;
- alignment->xscale = xscale;
- g_object_notify (G_OBJECT(alignment), "xscale");
- }
- if (alignment->yscale != yscale)
- {
- values_changed = TRUE;
- alignment->yscale = yscale;
- g_object_notify (G_OBJECT(alignment), "yscale");
- }
-
- if (values_changed == TRUE)
+ if ( (alignment->xalign != xalign)
+ || (alignment->yalign != yalign)
+ || (alignment->xscale != xscale)
+ || (alignment->yscale != yscale))
{
- gtk_widget_size_allocate (GTK_WIDGET (alignment), &(GTK_WIDGET (alignment)->allocation));
+ g_object_freeze_notify (G_OBJECT (alignment));
+ if (alignment->xalign != xalign)
+ {
+ alignment->xalign = xalign;
+ g_object_notify (G_OBJECT (alignment), "xalign");
+ }
+ if (alignment->yalign != yalign)
+ {
+ alignment->yalign = yalign;
+ g_object_notify (G_OBJECT (alignment), "yalign");
+ }
+ if (alignment->xscale != xscale)
+ {
+ alignment->xscale = xscale;
+ g_object_notify (G_OBJECT (alignment), "xscale");
+ }
+ if (alignment->yscale != yscale)
+ {
+ alignment->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);
gtk_widget_queue_draw (GTK_WIDGET (alignment));
}
}
gtk_alignment_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- GtkAlignment *alignment;
GtkBin *bin;
+ GtkAlignmentPrivate *priv;
- g_return_if_fail (GTK_IS_ALIGNMENT (widget));
- g_return_if_fail (requisition != NULL);
-
- 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;
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);
}
}
GtkAllocation child_allocation;
GtkRequisition child_requisition;
gint width, height;
- gint x, y;
+ gint border_width;
+ gint padding_horizontal, padding_vertical;
+ GtkAlignmentPrivate *priv;
- g_return_if_fail (GTK_IS_ALIGNMENT (widget));
- g_return_if_fail (allocation != NULL);
+ padding_horizontal = 0;
+ padding_vertical = 0;
widget->allocation = *allocation;
alignment = GTK_ALIGNMENT (widget);
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
gtk_widget_get_child_requisition (bin->child, &child_requisition);
-
- x = GTK_CONTAINER (alignment)->border_width;
- y = GTK_CONTAINER (alignment)->border_width;
- width = MAX (allocation->width - 2 * x, 0);
- height = MAX (allocation->height - 2 * y, 0);
-
+
+ border_width = GTK_CONTAINER (alignment)->border_width;
+
+ 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) +
else
child_allocation.height = height;
- child_allocation.x = alignment->xalign * (width - child_allocation.width) + allocation->x + x;
- child_allocation.y = alignment->yalign * (height - child_allocation.height) + allocation->y + y;
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ child_allocation.x = (1.0 - alignment->xalign) * (width - child_allocation.width) + allocation->x + border_width + priv->padding_right;
+ else
+ child_allocation.x = alignment->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;
gtk_widget_size_allocate (bin->child, &child_allocation);
}
}
+
+/**
+ * gtk_alignment_set_padding:
+ * @alignment: a #GtkAlignment
+ * @padding_top: the padding at the top of the widget
+ * @padding_bottom: the padding at the bottom of the widget
+ * @padding_left: the padding at the left of the widget
+ * @padding_right: the padding at the right of the widget.
+ *
+ * Sets the padding on the different sides of the widget.
+ * The padding adds blank space to the sides of the widget. For instance,
+ * this can be used to indent the child widget towards the right by adding
+ * padding on the left.
+ *
+ * Since: 2.4
+ */
+void
+gtk_alignment_set_padding (GtkAlignment *alignment,
+ guint padding_top,
+ guint padding_bottom,
+ guint padding_left,
+ guint padding_right)
+{
+ GtkAlignmentPrivate *priv;
+
+ g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
+
+ priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
+
+ 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");
+ }
+ if (priv->padding_bottom != padding_bottom)
+ {
+ priv->padding_bottom = padding_bottom;
+ 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");
+ }
+ if (priv->padding_right != padding_right)
+ {
+ priv->padding_right = padding_right;
+ 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);
+
+ gtk_widget_queue_draw (GTK_WIDGET (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
+ *
+ * Gets the padding on the different sides of the widget.
+ * See gtk_alignment_set_padding ().
+ *
+ * Since: 2.4
+ */
+void
+gtk_alignment_get_padding (GtkAlignment *alignment,
+ guint *padding_top,
+ guint *padding_bottom,
+ guint *padding_left,
+ guint *padding_right)
+{
+ GtkAlignmentPrivate *priv;
+
+ g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
+
+ priv = GTK_ALIGNMENT_GET_PRIVATE (alignment);
+ if(padding_top)
+ *padding_top = priv->padding_top;
+ if(padding_bottom)
+ *padding_bottom = priv->padding_bottom;
+ if(padding_left)
+ *padding_left = priv->padding_left;
+ if(padding_right)
+ *padding_right = priv->padding_right;
+}
+
+#define __GTK_ALIGNMENT_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff