-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* 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_XSCALE,
PROP_YSCALE,
- PROP_PADDING_TOP,
- PROP_PADDING_BOTTOM,
- PROP_PADDING_LEFT,
- PROP_PADDING_RIGHT,
-
- PROP_LAST
+ PROP_TOP_PADDING,
+ PROP_BOTTOM_PADDING,
+ PROP_LEFT_PADDING,
+ PROP_RIGHT_PADDING
};
+#define GTK_ALIGNMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ALIGNMENT, GtkAlignmentPrivate))
+
struct _GtkAlignmentPrivate
{
guint padding_top;
guint padding_right;
};
-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,
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;
-}
+G_DEFINE_TYPE (GtkAlignment, gtk_alignment, GTK_TYPE_BIN)
static void
gtk_alignment_class_init (GtkAlignmentClass *class)
g_object_class_install_property (gobject_class,
PROP_XALIGN,
g_param_spec_float("xalign",
- _("Horizontal alignment"),
- _("Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"),
+ 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"),
- _("Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"),
+ 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"),
- _("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"),
+ 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,
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",
- _("Vertical scale"),
- _("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"),
+ 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,
1.0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
/**
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_TOP,
- g_param_spec_uint("top_padding",
- _("Top Padding"),
- _("The padding to insert at the top of the widget."),
+ 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,
- 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.
*
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_BOTTOM,
- g_param_spec_uint("bottom_padding",
- _("Bottom Padding"),
- _("The padding to insert at the bottom of the widget."),
+ 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,
- 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.
*
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_LEFT,
- g_param_spec_uint("left_padding",
- _("Left Padding"),
- _("The padding to insert at the left of the widget."),
+ 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,
- 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.
*
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_RIGHT,
- g_param_spec_uint("right_padding",
- _("Right Padding"),
- _("The padding to insert at the right of the widget."),
+ 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,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPrivate));
}
break;
/* Padding: */
- case PROP_PADDING_TOP:
+ 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_PADDING_BOTTOM:
+ 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_PADDING_LEFT:
+ 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_PADDING_RIGHT:
+ case PROP_RIGHT_PADDING:
gtk_alignment_set_padding (alignment,
priv->padding_top,
priv->padding_bottom,
break;
/* Padding: */
- case PROP_PADDING_TOP:
+ case PROP_TOP_PADDING:
g_value_set_uint (value, priv->padding_top);
break;
- case PROP_PADDING_BOTTOM:
+ case PROP_BOTTOM_PADDING:
g_value_set_uint (value, priv->padding_bottom);
break;
- case PROP_PADDING_LEFT:
+ case PROP_LEFT_PADDING:
g_value_set_uint (value, priv->padding_left);
break;
- case PROP_PADDING_RIGHT:
+ case PROP_RIGHT_PADDING:
g_value_set_uint (value, priv->padding_right);
break;
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);
gint border_width;
gint padding_horizontal, padding_vertical;
GtkAlignmentPrivate *priv;
-
padding_horizontal = 0;
padding_vertical = 0;
else
child_allocation.height = height;
- child_allocation.x = alignment->xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left;
+ 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
+ * @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
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));
/**
* gtk_alignment_get_padding:
- * @alignment a #GtkAlignment
+ * @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
if(padding_right)
*padding_right = priv->padding_right;
}
+
+#define __GTK_ALIGNMENT_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff