* Modified by the GTK+ Team and others 1997-2001. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
#include <math.h>
#include "gtkarrow.h"
+#include "gtkprivate.h"
#include "gtkintl.h"
+#include "gtkalias.h"
-#define MIN_ARROW_SIZE 11
+#define MIN_ARROW_SIZE 15
enum {
PROP_0,
-
PROP_ARROW_TYPE,
- PROP_SHADOW_TYPE,
-
- PROP_LAST
+ PROP_SHADOW_TYPE
};
-static void gtk_arrow_class_init (GtkArrowClass *klass);
-static void gtk_arrow_init (GtkArrow *arrow);
-static gint gtk_arrow_expose (GtkWidget *widget,
- GdkEventExpose *event);
-static void gtk_arrow_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_arrow_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-
-GtkType
-gtk_arrow_get_type (void)
-{
- static GtkType arrow_type = 0;
+static void gtk_arrow_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_arrow_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static gboolean gtk_arrow_expose (GtkWidget *widget,
+ GdkEventExpose *event);
- if (!arrow_type)
- {
- static const GtkTypeInfo arrow_info =
- {
- "GtkArrow",
- sizeof (GtkArrow),
- sizeof (GtkArrowClass),
- (GtkClassInitFunc) gtk_arrow_class_init,
- (GtkObjectInitFunc) gtk_arrow_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- arrow_type = gtk_type_unique (GTK_TYPE_MISC, &arrow_info);
- }
- return arrow_type;
-}
+G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
+
static void
gtk_arrow_class_init (GtkArrowClass *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_arrow_set_property;
gobject_class->get_property = gtk_arrow_get_property;
-
+
+ widget_class->expose_event = gtk_arrow_expose;
+
g_object_class_install_property (gobject_class,
PROP_ARROW_TYPE,
- g_param_spec_enum ("arrow_type",
- _("Arrow direction"),
- _("The direction the arrow should point"),
+ g_param_spec_enum ("arrow-type",
+ P_("Arrow direction"),
+ P_("The direction the arrow should point"),
GTK_TYPE_ARROW_TYPE,
GTK_ARROW_RIGHT,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class,
PROP_SHADOW_TYPE,
- g_param_spec_enum ("shadow_type",
- _("Arrow shadow"),
- _("Appearance of the shadow surrounding the arrow"),
+ g_param_spec_enum ("shadow-type",
+ P_("Arrow shadow"),
+ P_("Appearance of the shadow surrounding the arrow"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_OUT,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
-
- widget_class->expose_event = gtk_arrow_expose;
+ GTK_PARAM_READWRITE));
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_float ("arrow-scaling",
+ P_("Arrow Scaling"),
+ P_("Amount of space used up by arrow"),
+ 0.0, 1.0, 0.7,
+ GTK_PARAM_READABLE));
}
static void
const GValue *value,
GParamSpec *pspec)
{
- GtkArrow *arrow;
-
- arrow = GTK_ARROW (object);
+ GtkArrow *arrow = GTK_ARROW (object);
switch (prop_id)
{
}
}
-
static void
gtk_arrow_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- GtkArrow *arrow;
-
- arrow = GTK_ARROW (object);
+ GtkArrow *arrow = GTK_ARROW (object);
+
switch (prop_id)
{
case PROP_ARROW_TYPE:
{
GtkArrow *arrow;
- arrow = gtk_type_new (GTK_TYPE_ARROW);
+ arrow = g_object_new (GTK_TYPE_ARROW, NULL);
arrow->arrow_type = arrow_type;
arrow->shadow_type = shadow_type;
if ((GtkArrowType) arrow->arrow_type != arrow_type)
{
arrow->arrow_type = arrow_type;
- g_object_notify (G_OBJECT (arrow), "arrow_type");
+ g_object_notify (G_OBJECT (arrow), "arrow-type");
}
if ((GtkShadowType) arrow->shadow_type != shadow_type)
{
arrow->shadow_type = shadow_type;
- g_object_notify (G_OBJECT (arrow), "shadow_type");
+ g_object_notify (G_OBJECT (arrow), "shadow-type");
}
g_object_thaw_notify (G_OBJECT (arrow));
if (GTK_WIDGET_DRAWABLE (arrow))
- gtk_widget_queue_clear (GTK_WIDGET (arrow));
+ gtk_widget_queue_draw (GTK_WIDGET (arrow));
}
}
-static gboolean
+static gboolean
gtk_arrow_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkArrow *arrow;
- GtkMisc *misc;
- GtkShadowType shadow_type;
- gint width, height;
- gint x, y;
- gint extent;
- gfloat xalign;
-
if (GTK_WIDGET_DRAWABLE (widget))
{
- arrow = GTK_ARROW (widget);
- misc = GTK_MISC (widget);
+ GtkArrow *arrow = GTK_ARROW (widget);
+ GtkMisc *misc = GTK_MISC (widget);
+ GtkShadowType shadow_type;
+ gint width, height;
+ gint x, y;
+ gint extent;
+ gfloat xalign;
+ GtkArrowType effective_arrow_type;
+ gfloat arrow_scaling;
+
+ gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
width = widget->allocation.width - misc->xpad * 2;
height = widget->allocation.height - misc->ypad * 2;
- extent = MIN (width, height) * 0.7;
+ extent = MIN (width, height) * arrow_scaling;
+ effective_arrow_type = arrow->arrow_type;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
xalign = misc->xalign;
else
- xalign = 1.0 - misc->xalign;
+ {
+ xalign = 1.0 - misc->xalign;
+ if (arrow->arrow_type == GTK_ARROW_LEFT)
+ effective_arrow_type = GTK_ARROW_RIGHT;
+ else if (arrow->arrow_type == GTK_ARROW_RIGHT)
+ effective_arrow_type = GTK_ARROW_LEFT;
+ }
x = floor (widget->allocation.x + misc->xpad
- + ((widget->allocation.width - extent) * xalign)
- + 0.5);
- y = floor (widget->allocation.y + misc->ypad
- + ((widget->allocation.height - extent) * misc->yalign)
- + 0.5);
-
+ + ((widget->allocation.width - extent) * xalign));
+ y = floor (widget->allocation.y + misc->ypad
+ + ((widget->allocation.height - extent) * misc->yalign));
+
shadow_type = arrow->shadow_type;
if (widget->state == GTK_STATE_ACTIVE)
gtk_paint_arrow (widget->style, widget->window,
widget->state, shadow_type,
&event->area, widget, "arrow",
- arrow->arrow_type, TRUE,
+ effective_arrow_type, TRUE,
x, y, extent, extent);
}
return FALSE;
}
+
+#define __GTK_ARROW_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff