* 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 <http://www.gnu.org/licenses/>.
*/
/*
* SECTION:gtkarrow
* @Short_description: Displays an arrow
* @Title: GtkArrow
- * @See_also: gtk_paint_arrow()
+ * @See_also: gtk_render_arrow()
*
* GtkArrow should be used to draw simple arrows that need to point in
* one of the four cardinal directions (up, down, left, or right). The
#include "config.h"
#include <math.h>
#include "gtkarrow.h"
+#include "gtksizerequest.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtkintl.h"
+#include "a11y/gtkarrowaccessible.h"
+
#define MIN_ARROW_SIZE 15
-struct _GtkArrowPriv
+struct _GtkArrowPrivate
{
gint16 arrow_type;
gint16 shadow_type;
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static gboolean gtk_arrow_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean gtk_arrow_draw (GtkWidget *widget,
+ cairo_t *cr);
+static void gtk_arrow_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_arrow_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
gobject_class->set_property = gtk_arrow_set_property;
gobject_class->get_property = gtk_arrow_get_property;
- widget_class->expose_event = gtk_arrow_expose;
+ widget_class->draw = gtk_arrow_draw;
+ widget_class->get_preferred_width = gtk_arrow_get_preferred_width;
+ widget_class->get_preferred_height = gtk_arrow_get_preferred_height;
g_object_class_install_property (gobject_class,
PROP_ARROW_TYPE,
0.0, 1.0, 0.7,
GTK_PARAM_READABLE));
- g_type_class_add_private (class, sizeof (GtkArrowPriv));
+ g_type_class_add_private (class, sizeof (GtkArrowPrivate));
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ARROW_ACCESSIBLE);
}
static void
GParamSpec *pspec)
{
GtkArrow *arrow = GTK_ARROW (object);
- GtkArrowPriv *priv = arrow->priv;
+ GtkArrowPrivate *priv = arrow->priv;
switch (prop_id)
{
GParamSpec *pspec)
{
GtkArrow *arrow = GTK_ARROW (object);
- GtkArrowPriv *priv = arrow->priv;
+ GtkArrowPrivate *priv = arrow->priv;
switch (prop_id)
{
static void
gtk_arrow_init (GtkArrow *arrow)
{
- GtkArrowPriv *priv;
- gint xpad, ypad;
+ GtkArrowPrivate *priv;
arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow,
GTK_TYPE_ARROW,
- GtkArrowPriv);
+ GtkArrowPrivate);
priv = arrow->priv;
gtk_widget_set_has_window (GTK_WIDGET (arrow), FALSE);
- gtk_misc_get_padding (GTK_MISC (arrow), &xpad, &ypad);
- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + xpad * 2;
- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + ypad * 2;
-
priv->arrow_type = GTK_ARROW_RIGHT;
priv->shadow_type = GTK_SHADOW_OUT;
}
+static void
+gtk_arrow_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkBorder border;
+
+ _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
+
+ if (minimum_size)
+ *minimum_size = MIN_ARROW_SIZE + border.left + border.right;
+
+ if (natural_size)
+ *natural_size = MIN_ARROW_SIZE + border.left + border.right;
+}
+
+static void
+gtk_arrow_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkBorder border;
+
+ _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
+
+ if (minimum_size)
+ *minimum_size = MIN_ARROW_SIZE + border.top + border.bottom;
+
+ if (natural_size)
+ *natural_size = MIN_ARROW_SIZE + border.top + border.bottom;
+}
+
/**
* gtk_arrow_new:
* @arrow_type: a valid #GtkArrowType.
gtk_arrow_new (GtkArrowType arrow_type,
GtkShadowType shadow_type)
{
- GtkArrowPriv *priv;
+ GtkArrowPrivate *priv;
GtkArrow *arrow;
arrow = g_object_new (GTK_TYPE_ARROW, NULL);
GtkArrowType arrow_type,
GtkShadowType shadow_type)
{
- GtkArrowPriv *priv;
+ GtkArrowPrivate *priv;
GtkWidget *widget;
g_return_if_fail (GTK_IS_ARROW (arrow));
}
}
-
static gboolean
-gtk_arrow_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_arrow_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- if (gtk_widget_is_drawable (widget))
+ GtkArrow *arrow = GTK_ARROW (widget);
+ GtkArrowPrivate *priv = arrow->priv;
+ GtkStyleContext *context;
+ gdouble x, y;
+ gint width, height;
+ gint extent;
+ GtkBorder border;
+ gfloat xalign, yalign;
+ GtkArrowType effective_arrow_type;
+ gfloat arrow_scaling;
+ gdouble angle;
+
+ if (priv->arrow_type == GTK_ARROW_NONE)
+ return FALSE;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
+
+ _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
+ gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign);
+
+ width = gtk_widget_get_allocated_width (widget) - border.left - border.right;
+ height = gtk_widget_get_allocated_height (widget) - border.top - border.bottom;
+
+ extent = MIN (width, height) * arrow_scaling;
+ effective_arrow_type = priv->arrow_type;
+
+ if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
{
- GtkArrow *arrow = GTK_ARROW (widget);
- GtkArrowPriv *priv = arrow->priv;
- GtkMisc *misc = GTK_MISC (widget);
- GtkShadowType shadow_type;
- gint width, height;
- gint x, y;
- gint extent;
- gint xpad, ypad;
- gfloat xalign, yalign;
- GtkArrowType effective_arrow_type;
- gfloat arrow_scaling;
-
- gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
-
- gtk_misc_get_padding (misc, &xpad, &ypad);
- gtk_misc_get_alignment (misc, &xalign, &yalign);
-
- width = widget->allocation.width - xpad * 2;
- height = widget->allocation.height - ypad * 2;
- extent = MIN (width, height) * arrow_scaling;
- effective_arrow_type = priv->arrow_type;
-
- if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
- {
- xalign = 1.0 - xalign;
- if (priv->arrow_type == GTK_ARROW_LEFT)
- effective_arrow_type = GTK_ARROW_RIGHT;
- else if (priv->arrow_type == GTK_ARROW_RIGHT)
- effective_arrow_type = GTK_ARROW_LEFT;
- }
-
- x = floor (widget->allocation.x + xpad
- + ((widget->allocation.width - extent) * xalign));
- y = floor (widget->allocation.y + ypad
- + ((widget->allocation.height - extent) * yalign));
-
- shadow_type = priv->shadow_type;
-
- if (widget->state == GTK_STATE_ACTIVE)
- {
- if (shadow_type == GTK_SHADOW_IN)
- shadow_type = GTK_SHADOW_OUT;
- else if (shadow_type == GTK_SHADOW_OUT)
- shadow_type = GTK_SHADOW_IN;
- else if (shadow_type == GTK_SHADOW_ETCHED_IN)
- shadow_type = GTK_SHADOW_ETCHED_OUT;
- else if (shadow_type == GTK_SHADOW_ETCHED_OUT)
- shadow_type = GTK_SHADOW_ETCHED_IN;
- }
-
- gtk_paint_arrow (widget->style, widget->window,
- widget->state, shadow_type,
- &event->area, widget, "arrow",
- effective_arrow_type, TRUE,
- x, y, extent, extent);
+ xalign = 1.0 - xalign;
+ if (priv->arrow_type == GTK_ARROW_LEFT)
+ effective_arrow_type = GTK_ARROW_RIGHT;
+ else if (priv->arrow_type == GTK_ARROW_RIGHT)
+ effective_arrow_type = GTK_ARROW_LEFT;
+ }
+
+ x = border.left + ((width - extent) * xalign);
+ y = border.top + ((height - extent) * yalign);
+
+ switch (effective_arrow_type)
+ {
+ case GTK_ARROW_UP:
+ angle = 0;
+ break;
+ case GTK_ARROW_RIGHT:
+ angle = G_PI / 2;
+ break;
+ case GTK_ARROW_DOWN:
+ angle = G_PI;
+ break;
+ case GTK_ARROW_LEFT:
+ default:
+ angle = (3 * G_PI) / 2;
+ break;
}
+ gtk_render_arrow (context, cr, angle, x, y, extent);
+
return FALSE;
}
projects / ~andy / gtk / blobdiff