* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * 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.
*/
-#include "gtkarrow.h"
+/*
+ * 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/.
+ */
+
+#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 {
- ARG_0,
- ARG_ARROW_TYPE,
- ARG_SHADOW_TYPE
+ PROP_0,
+ PROP_ARROW_TYPE,
+ 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_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-static void gtk_arrow_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-
+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);
-GtkType
-gtk_arrow_get_type (void)
-{
- static GtkType arrow_type = 0;
- if (!arrow_type)
- {
- 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);
- }
+G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
- return arrow_type;
-}
static void
gtk_arrow_class_init (GtkArrowClass *class)
{
- GtkObjectClass *object_class;
+ GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- object_class = (GtkObjectClass*) class;
+ gobject_class = (GObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
- gtk_object_add_arg_type ("GtkArrow::arrow_type", GTK_TYPE_ARROW_TYPE, GTK_ARG_READWRITE, ARG_ARROW_TYPE);
- gtk_object_add_arg_type ("GtkArrow::shadow_type", GTK_TYPE_SHADOW_TYPE, GTK_ARG_READWRITE, ARG_SHADOW_TYPE);
-
- object_class->set_arg = gtk_arrow_set_arg;
- object_class->get_arg = gtk_arrow_get_arg;
+ 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",
+ P_("Arrow direction"),
+ P_("The direction the arrow should point"),
+ GTK_TYPE_ARROW_TYPE,
+ GTK_ARROW_RIGHT,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_SHADOW_TYPE,
+ g_param_spec_enum ("shadow-type",
+ P_("Arrow shadow"),
+ P_("Appearance of the shadow surrounding the arrow"),
+ GTK_TYPE_SHADOW_TYPE,
+ GTK_SHADOW_OUT,
+ 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
-gtk_arrow_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id)
+gtk_arrow_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- GtkArrow *arrow;
+ GtkArrow *arrow = GTK_ARROW (object);
- arrow = GTK_ARROW (object);
-
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_ARROW_TYPE:
+ case PROP_ARROW_TYPE:
gtk_arrow_set (arrow,
- GTK_VALUE_ENUM (*arg),
+ g_value_get_enum (value),
arrow->shadow_type);
break;
- case ARG_SHADOW_TYPE:
+ case PROP_SHADOW_TYPE:
gtk_arrow_set (arrow,
arrow->arrow_type,
- GTK_VALUE_ENUM (*arg));
+ g_value_get_enum (value));
break;
default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
-gtk_arrow_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id)
+gtk_arrow_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- GtkArrow *arrow;
+ GtkArrow *arrow = GTK_ARROW (object);
- arrow = GTK_ARROW (object);
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_ARROW_TYPE:
- GTK_VALUE_ENUM (*arg) = arrow->arrow_type;
+ case PROP_ARROW_TYPE:
+ g_value_set_enum (value, arrow->arrow_type);
break;
- case ARG_SHADOW_TYPE:
- GTK_VALUE_ENUM (*arg) = arrow->shadow_type;
+ case PROP_SHADOW_TYPE:
+ g_value_set_enum (value, arrow->shadow_type);
break;
default:
- arg->type = GTK_TYPE_INVALID;
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
{
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;
GtkArrowType arrow_type,
GtkShadowType shadow_type)
{
- g_return_if_fail (arrow != NULL);
g_return_if_fail (GTK_IS_ARROW (arrow));
- if (((GtkArrowType) arrow->arrow_type != arrow_type) ||
- ((GtkShadowType) arrow->shadow_type != shadow_type))
+ if ( ((GtkArrowType) arrow->arrow_type != arrow_type)
+ || ((GtkShadowType) arrow->shadow_type != shadow_type))
{
- arrow->arrow_type = arrow_type;
- arrow->shadow_type = shadow_type;
+ g_object_freeze_notify (G_OBJECT (arrow));
+
+ if ((GtkArrowType) arrow->arrow_type != arrow_type)
+ {
+ arrow->arrow_type = 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_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 gint
+static gboolean
gtk_arrow_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkArrow *arrow;
- GtkMisc *misc;
- GtkShadowType shadow_type;
- gint width, height;
- gint x, y;
- gint extent;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_ARROW (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
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);
+ 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;
+ 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 = ((widget->allocation.x + misc->xpad) * (1.0 - misc->xalign) +
- (widget->allocation.x + widget->allocation.width - extent - misc->xpad) * misc->xalign);
- y = ((widget->allocation.y + misc->ypad) * (1.0 - misc->yalign) +
- (widget->allocation.y + widget->allocation.height - extent - misc->ypad) * misc->yalign);
+ x = floor (widget->allocation.x + misc->xpad
+ + ((widget->allocation.width - extent) * xalign));
+ y = floor (widget->allocation.y + misc->ypad
+ + ((widget->allocation.height - extent) * misc->yalign));
shadow_type = arrow->shadow_type;
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 TRUE;
+ return FALSE;
}
+
+#define __GTK_ARROW_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff