[clutter] Add zoom action
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Add zoom action
- Date: Mon, 20 Aug 2012 17:30:06 +0000 (UTC)
commit 84325057af82bb104180da01c8cb1789b71b4a9b
Author: Lionel Landwerlin <llandwerlin gmail com>
Date: Tue Aug 14 03:35:43 2012 +0100
Add zoom action
https://bugzilla.gnome.org/show_bug.cgi?id=678427
clutter/Makefile.am | 6 +-
clutter/clutter-enums.h | 19 ++-
clutter/clutter-marshal.list | 1 +
clutter/clutter-zoom-action.c | 510 +++++++++++++++++++++++++++++++++++++++++
clutter/clutter-zoom-action.h | 114 +++++++++
clutter/clutter.h | 1 +
clutter/clutter.symbols | 7 +
7 files changed, 655 insertions(+), 3 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index c811066..7d479b2 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -125,6 +125,7 @@ source_h = \
$(srcdir)/clutter-transition.h \
$(srcdir)/clutter-types.h \
$(srcdir)/clutter-units.h \
+ $(srcdir)/clutter-zoom-action.h \
$(NULL)
source_c = \
@@ -206,6 +207,7 @@ source_c = \
$(srcdir)/clutter-units.c \
$(srcdir)/clutter-util.c \
$(srcdir)/clutter-paint-volume.c \
+ $(srcdir)/clutter-zoom-action.c \
$(NULL)
# private headers; these should not be distributed or introspected
@@ -858,7 +860,7 @@ dist-hook: ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj
done >clutter.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/clutter.vcprojin >$@
rm clutter.sourcefiles
-
+
../build/win32/vs10/clutter.vcxproj: $(top_srcdir)/build/win32/vs10/clutter.vcxprojin
for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
case $$F in \
@@ -868,7 +870,7 @@ dist-hook: ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj
done >clutter.vs10.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/clutter.vcxprojin >$@
rm clutter.vs10.sourcefiles
-
+
../build/win32/vs10/clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/clutter.vcxproj.filtersin
for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
case $$F in \
diff --git a/clutter/clutter-enums.h b/clutter/clutter-enums.h
index c59c3cf..1110eba 100644
--- a/clutter/clutter-enums.h
+++ b/clutter/clutter-enums.h
@@ -833,7 +833,7 @@ typedef enum {
*
* Since: 0.4
*/
-typedef enum
+typedef enum
{
CLUTTER_FEATURE_TEXTURE_NPOT = (1 << 2),
CLUTTER_FEATURE_SYNC_TO_VBLANK = (1 << 3),
@@ -1321,6 +1321,23 @@ typedef enum {
CLUTTER_STEP_MODE_END
} ClutterStepMode;
+/**
+ * ClutterZoomAxis:
+ * @CLUTTER_ZOOM_X_AXIS: Scale only on the X axis
+ * @CLUTTER_ZOOM_Y_AXIS: Scale only on the Y axis
+ * @CLUTTER_ZOOM_BOTH: Scale on both axis
+ *
+ * The axis of the constraint that should be applied by the
+ * zooming action.
+ *
+ * Since: 1.12
+ */
+typedef enum { /*< prefix=CLUTTER_ZOOM >*/
+ CLUTTER_ZOOM_X_AXIS,
+ CLUTTER_ZOOM_Y_AXIS,
+ CLUTTER_ZOOM_BOTH
+} ClutterZoomAxis;
+
G_END_DECLS
#endif /* __CLUTTER_ENUMS_H__ */
diff --git a/clutter/clutter-marshal.list b/clutter/clutter-marshal.list
index efe8fb5..e97e5a5 100644
--- a/clutter/clutter-marshal.list
+++ b/clutter/clutter-marshal.list
@@ -1,5 +1,6 @@
BOOLEAN:BOXED
BOOLEAN:BOXED,INT,INT
+BOOLEAN:OBJECT,BOXED,DOUBLE
BOOLEAN:OBJECT,ENUM
BOOLEAN:STRING,UINT,FLAGS
BOOLEAN:OBJECT
diff --git a/clutter/clutter-zoom-action.c b/clutter/clutter-zoom-action.c
new file mode 100644
index 0000000..abc24c4
--- /dev/null
+++ b/clutter/clutter-zoom-action.c
@@ -0,0 +1,510 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2012 Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ * Lionel Landwerlin <lionel g landwerlin linux intel com>
+ */
+
+/**
+ * SECTION:clutter-zoom-action
+ * @Title: ClutterZoomAction
+ * @Short_Description: Action enabling zooming on actors
+ *
+ * #ClutterZoomAction is a sub-class of #ClutterGestureAction that
+ * implements all the necessary logic for zooming actors.
+ *
+ * The simplest usage of #ClutterZoomAction consists in adding it to
+ * a #ClutterActor and setting it as reactive; for instance, the following
+ * code:
+ *
+ * |[
+ * clutter_actor_add_action (actor, clutter_zoom_action_new ());
+ * clutter_actor_set_reactive (actor, TRUE);
+ * ]|
+ *
+ * will automatically result in the actor to be scale according to the
+ * distance between 2 touch points.
+ *
+ * Since: 1.12
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+
+#include "clutter-zoom-action.h"
+
+#include "clutter-debug.h"
+#include "clutter-enum-types.h"
+#include "clutter-marshal.h"
+#include "clutter-private.h"
+#include "clutter-stage-private.h"
+
+typedef struct
+{
+ gfloat start_x;
+ gfloat start_y;
+ gfloat transformed_start_x;
+ gfloat transformed_start_y;
+
+ gfloat update_x;
+ gfloat update_y;
+ gfloat transformed_update_x;
+ gfloat transformed_update_y;
+} ZoomPoint;
+
+struct _ClutterZoomActionPrivate
+{
+ ClutterStage *stage;
+
+ ClutterZoomAxis zoom_axis;
+
+ ZoomPoint points[2];
+
+ ClutterPoint focal_point;
+ ClutterPoint transformed_focal_point;
+
+ gfloat initial_x;
+ gfloat initial_y;
+ gfloat initial_z;
+
+ gdouble initial_scale_x;
+ gdouble initial_scale_y;
+
+ gdouble zoom_initial_distance;
+};
+
+enum
+{
+ PROP_0,
+
+ PROP_ZOOM_AXIS,
+
+ PROP_LAST
+};
+
+static GParamSpec *zoom_props[PROP_LAST] = { NULL, };
+
+enum
+{
+ ZOOM,
+
+ LAST_SIGNAL
+};
+
+static guint zoom_signals[LAST_SIGNAL] = { 0, };
+
+G_DEFINE_TYPE (ClutterZoomAction, clutter_zoom_action, CLUTTER_TYPE_GESTURE_ACTION);
+
+static void
+capture_point_initial_position (ClutterGestureAction *action,
+ ClutterActor *actor,
+ gint device,
+ ZoomPoint *point)
+{
+ clutter_gesture_action_get_motion_coords (action, device,
+ &point->start_x,
+ &point->start_y);
+
+ point->transformed_start_x = point->update_x = point->start_x;
+ point->transformed_start_y = point->update_x = point->start_y;
+ clutter_actor_transform_stage_point (actor,
+ point->start_x, point->start_y,
+ &point->transformed_start_x,
+ &point->transformed_start_y);
+ point->transformed_update_x = point->transformed_start_x;
+ point->transformed_update_y = point->transformed_start_y;
+}
+
+static void
+capture_point_update_position (ClutterGestureAction *action,
+ ClutterActor *actor,
+ gint device,
+ ZoomPoint *point)
+{
+ clutter_gesture_action_get_motion_coords (action, device,
+ &point->update_x,
+ &point->update_y);
+
+ point->transformed_update_x = point->update_x;
+ point->transformed_update_y = point->update_y;
+ clutter_actor_transform_stage_point (actor,
+ point->update_x, point->update_y,
+ &point->transformed_update_x,
+ &point->transformed_update_y);
+}
+
+static gboolean
+clutter_zoom_action_gesture_begin (ClutterGestureAction *action,
+ ClutterActor *actor)
+{
+ ClutterZoomActionPrivate *priv = ((ClutterZoomAction *) action)->priv;
+ gfloat dx, dy;
+
+ capture_point_initial_position (action, actor, 0, &priv->points[0]);
+ capture_point_initial_position (action, actor, 1, &priv->points[1]);
+
+ dx = priv->points[1].transformed_start_x - priv->points[0].transformed_start_x;
+ dy = priv->points[1].transformed_start_y - priv->points[0].transformed_start_y;
+ priv->zoom_initial_distance = sqrt (dx * dx + dy * dy);
+
+ clutter_actor_get_translation (actor,
+ &priv->initial_x,
+ &priv->initial_y,
+ &priv->initial_z);
+ clutter_actor_get_scale (actor,
+ &priv->initial_scale_x,
+ &priv->initial_scale_y);
+
+ return TRUE;
+}
+
+static gboolean
+clutter_zoom_action_gesture_progress (ClutterGestureAction *action,
+ ClutterActor *actor)
+{
+ ClutterZoomActionPrivate *priv = ((ClutterZoomAction *) action)->priv;
+ gdouble distance, new_scale;
+ gfloat dx, dy;
+ gboolean retval;
+
+ capture_point_update_position (action, actor, 0, &priv->points[0]);
+ capture_point_update_position (action, actor, 1, &priv->points[1]);
+
+ dx = priv->points[1].update_x - priv->points[0].update_x;
+ dy = priv->points[1].update_y - priv->points[0].update_y;
+ distance = sqrt (dx * dx + dy * dy);
+
+ if (distance == 0)
+ return TRUE;
+
+ priv->focal_point.x = (priv->points[0].update_x + priv->points[1].update_x) / 2;
+ priv->focal_point.y = (priv->points[0].update_y + priv->points[1].update_y) / 2;
+ priv->transformed_focal_point.x = (priv->points[0].transformed_update_x +
+ priv->points[1].transformed_update_x) / 2;
+ priv->transformed_focal_point.y = (priv->points[0].transformed_update_y +
+ priv->points[1].transformed_update_y) / 2;
+
+
+ new_scale = distance / priv->zoom_initial_distance;
+
+ g_signal_emit (action, zoom_signals[ZOOM], 0,
+ actor, &priv->focal_point, new_scale,
+ &retval);
+
+ return TRUE;
+}
+
+static void
+clutter_zoom_action_gesture_cancel (ClutterGestureAction *action,
+ ClutterActor *actor)
+{
+ ClutterZoomActionPrivate *priv = ((ClutterZoomAction *) action)->priv;
+
+ clutter_actor_set_translation (actor,
+ priv->initial_x,
+ priv->initial_y,
+ priv->initial_z);
+ clutter_actor_set_scale (actor, priv->initial_scale_x, priv->initial_scale_y);
+}
+
+static gboolean
+clutter_zoom_action_real_zoom (ClutterZoomAction *action,
+ ClutterActor *actor,
+ ClutterPoint *focal_point,
+ gdouble factor)
+{
+ ClutterZoomActionPrivate *priv = action->priv;
+ ClutterActor *parent = clutter_actor_get_parent (actor);
+ gfloat x, y, z;
+ gdouble scale_x, scale_y;
+ ClutterVertex out, in;
+
+ clutter_actor_get_scale (actor, &scale_x, &scale_y);
+
+ switch (priv->zoom_axis)
+ {
+ case CLUTTER_ZOOM_BOTH:
+ clutter_actor_set_scale (actor, factor, factor);
+ break;
+
+ case CLUTTER_ZOOM_X_AXIS:
+ clutter_actor_set_scale (actor, factor, scale_y);
+ break;
+
+ case CLUTTER_ZOOM_Y_AXIS:
+ clutter_actor_set_scale (actor, scale_x, factor);
+ break;
+
+ default:
+ break;
+ }
+
+
+ in.x = priv->transformed_focal_point.x;
+ in.y = priv->transformed_focal_point.y;
+ in.z = 0;
+
+ clutter_actor_apply_relative_transform_to_point (actor,
+ parent,
+ &in, &out);
+
+
+ clutter_actor_get_translation (actor, &x, &y, &z);
+ clutter_actor_set_translation (actor,
+ x + priv->focal_point.x - out.x,
+ y + priv->focal_point.y - out.y,
+ z);
+
+ return TRUE;
+}
+
+static void
+clutter_zoom_action_set_property (GObject *gobject,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ ClutterZoomAction *action = CLUTTER_ZOOM_ACTION (gobject);
+
+ switch (prop_id)
+ {
+ case PROP_ZOOM_AXIS:
+ clutter_zoom_action_set_zoom_axis (action, g_value_get_enum (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+ }
+}
+
+static void
+clutter_zoom_action_get_property (GObject *gobject,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ ClutterZoomActionPrivate *priv = CLUTTER_ZOOM_ACTION (gobject)->priv;
+
+ switch (prop_id)
+ {
+ case PROP_ZOOM_AXIS:
+ g_value_set_enum (value, priv->zoom_axis);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+ }
+}
+
+static void
+clutter_zoom_action_dispose (GObject *gobject)
+{
+ G_OBJECT_CLASS (clutter_zoom_action_parent_class)->dispose (gobject);
+}
+
+static void
+clutter_zoom_action_class_init (ClutterZoomActionClass *klass)
+{
+ ClutterGestureActionClass *gesture_class =
+ CLUTTER_GESTURE_ACTION_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (ClutterZoomActionPrivate));
+
+ gobject_class->set_property = clutter_zoom_action_set_property;
+ gobject_class->get_property = clutter_zoom_action_get_property;
+ gobject_class->dispose = clutter_zoom_action_dispose;
+
+ gesture_class->gesture_begin = clutter_zoom_action_gesture_begin;
+ gesture_class->gesture_progress = clutter_zoom_action_gesture_progress;
+ gesture_class->gesture_cancel = clutter_zoom_action_gesture_cancel;
+
+ klass->zoom = clutter_zoom_action_real_zoom;
+
+ /**
+ * ClutterZoomAction:zoom-axis:
+ *
+ * Constraints the zooming action to the specified axis
+ *
+ * Since: 1.12
+ */
+ zoom_props[PROP_ZOOM_AXIS] =
+ g_param_spec_enum ("zoom-axis",
+ P_("Zoom Axis"),
+ P_("Constraints the zoom to an axis"),
+ CLUTTER_TYPE_ZOOM_AXIS,
+ CLUTTER_ZOOM_BOTH,
+ CLUTTER_PARAM_READWRITE);
+
+ g_object_class_install_properties (gobject_class,
+ PROP_LAST,
+ zoom_props);
+
+ /**
+ * ClutterZoomAction::zoom:
+ * @action: the #ClutterZoomAction that emitted the signal
+ * @actor: the #ClutterActor attached to the action
+ * @distance: the initial distance between the 2 touch points
+ *
+ * The ::zoom signal is emitted for each touch event after the
+ * #ClutterZoomAction::zoom-begin signal has been emitted.
+ *
+ * The components of the distance between the touch begin event and
+ * the latest touch update event are computed in the actor's
+ * coordinate space, to take into account eventual transformations.
+ * If you want the stage coordinates of the latest motion event you
+ * can use clutter_zoom_action_get_motion_coords().
+ *
+ * The default handler of the signal will call
+ * clutter_actor_set_scale() on @actor using the ratio of the first
+ * distance between the 2 touch points and the current distance. If
+ * you want to override the default behaviour, you can connect to
+ * this signal and call g_signal_stop_emission_by_name() from within
+ * your callback.
+ *
+ * Return value: %TRUE if the zoom action has been handled by one of
+ * the listener or %FALSE to continue the emission.
+ *
+ * Since: 1.12
+ */
+ zoom_signals[ZOOM] =
+ g_signal_new (I_("zoom"),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ClutterZoomActionClass, zoom),
+ _clutter_boolean_continue_accumulator, NULL,
+ _clutter_marshal_BOOLEAN__OBJECT_BOXED_DOUBLE,
+ G_TYPE_BOOLEAN, 3,
+ CLUTTER_TYPE_ACTOR,
+ CLUTTER_TYPE_POINT,
+ G_TYPE_DOUBLE);
+}
+
+static void
+clutter_zoom_action_init (ClutterZoomAction *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, CLUTTER_TYPE_ZOOM_ACTION,
+ ClutterZoomActionPrivate);
+
+ self->priv->zoom_axis = CLUTTER_ZOOM_BOTH;
+
+ clutter_gesture_action_set_n_touch_points (CLUTTER_GESTURE_ACTION (self), 2);
+}
+
+/**
+ * clutter_zoom_action_new:
+ *
+ * Creates a new #ClutterZoomAction instance
+ *
+ * Return value: the newly created #ClutterZoomAction
+ *
+ * Since: 1.12
+ */
+ClutterAction *
+clutter_zoom_action_new (void)
+{
+ return g_object_new (CLUTTER_TYPE_ZOOM_ACTION, NULL);
+}
+
+/**
+ * clutter_zoom_action_set_zoom_axis:
+ * @action: a #ClutterZoomAction
+ * @axis: the axis to constraint the zooming to
+ *
+ * Restricts the zooming action to a specific axis
+ *
+ * Since: 1.12
+ */
+void
+clutter_zoom_action_set_zoom_axis (ClutterZoomAction *action,
+ ClutterZoomAxis axis)
+{
+ g_return_if_fail (CLUTTER_IS_ZOOM_ACTION (action));
+ g_return_if_fail (axis >= CLUTTER_ZOOM_X_AXIS &&
+ axis <= CLUTTER_ZOOM_BOTH);
+
+ if (action->priv->zoom_axis == axis)
+ return;
+
+ action->priv->zoom_axis = axis;
+
+ g_object_notify_by_pspec (G_OBJECT (action), zoom_props[PROP_ZOOM_AXIS]);
+}
+
+/**
+ * clutter_zoom_action_get_zoom_axis:
+ * @action: a #ClutterZoomAction
+ *
+ * Retrieves the axis constraint set by clutter_zoom_action_set_zoom_axis()
+ *
+ * Return value: the axis constraint
+ *
+ * Since: 1.12
+ */
+ClutterZoomAxis
+clutter_zoom_action_get_zoom_axis (ClutterZoomAction *action)
+{
+ g_return_val_if_fail (CLUTTER_IS_ZOOM_ACTION (action),
+ CLUTTER_ZOOM_BOTH);
+
+ return action->priv->zoom_axis;
+}
+
+/**
+ * clutter_zoom_action_get_focal_point:
+ * @action: a #ClutterZoomAction
+ * @point: (out): a #ClutterPoint
+ *
+ * Retrieves the focal point of the current zoom
+ *
+ * Since: 1.12
+ */
+void
+clutter_zoom_action_get_focal_point (ClutterZoomAction *action,
+ ClutterPoint *point)
+{
+ g_return_if_fail (CLUTTER_IS_ZOOM_ACTION (action));
+ g_return_if_fail (point != NULL);
+
+ *point = action->priv->focal_point;
+}
+
+/**
+ * clutter_zoom_action_get_transformed_focal_point:
+ * @action: a #ClutterZoomAction
+ * @point: (out): a #ClutterPoint
+ *
+ * Retrieves the focal point relative to the actor's coordinates of
+ * the current zoom
+ *
+ * Since: 1.12
+ */
+void
+clutter_zoom_action_get_transformed_focal_point (ClutterZoomAction *action,
+ ClutterPoint *point)
+{
+ g_return_if_fail (CLUTTER_IS_ZOOM_ACTION (action));
+ g_return_if_fail (point != NULL);
+
+ *point = action->priv->transformed_focal_point;
+}
diff --git a/clutter/clutter-zoom-action.h b/clutter/clutter-zoom-action.h
new file mode 100644
index 0000000..3111e12
--- /dev/null
+++ b/clutter/clutter-zoom-action.h
@@ -0,0 +1,114 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2012 Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ * Lionel Landwerlin <lionel g landwerlin linux intel com>
+ */
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_ZOOM_ACTION_H__
+#define __CLUTTER_ZOOM_ACTION_H__
+
+#include <clutter/clutter-event.h>
+#include <clutter/clutter-gesture-action.h>
+#include <clutter/clutter-types.h>
+
+G_BEGIN_DECLS
+
+#define CLUTTER_TYPE_ZOOM_ACTION (clutter_zoom_action_get_type ())
+#define CLUTTER_ZOOM_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_ZOOM_ACTION, ClutterZoomAction))
+#define CLUTTER_IS_ZOOM_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_ZOOM_ACTION))
+#define CLUTTER_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_ZOOM_ACTION, ClutterZoomActionClass))
+#define CLUTTER_IS_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_ZOOM_ACTION))
+#define CLUTTER_ZOOM_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_ZOOM_ACTION, ClutterZoomActionClass))
+
+typedef struct _ClutterZoomAction ClutterZoomAction;
+typedef struct _ClutterZoomActionPrivate ClutterZoomActionPrivate;
+typedef struct _ClutterZoomActionClass ClutterZoomActionClass;
+
+/**
+ * ClutterZoomAction:
+ *
+ * The <structname>ClutterZoomAction</structname> structure contains only
+ * private data and should be accessed using the provided API
+ *
+ * Since: 1.12
+ */
+struct _ClutterZoomAction
+{
+ /*< private >*/
+ ClutterGestureAction parent_instance;
+
+ ClutterZoomActionPrivate *priv;
+};
+
+/**
+ * ClutterZoomActionClass:
+ * @zoom: class handler of the #ClutterZoomAction::zoom signal
+ *
+ * The <structname>ClutterZoomActionClass</structname> structure contains
+ * only private data
+ *
+ * Since: 1.12
+ */
+struct _ClutterZoomActionClass
+{
+ /*< private >*/
+ ClutterGestureActionClass parent_class;
+
+ /*< public >*/
+ gboolean (* zoom) (ClutterZoomAction *action,
+ ClutterActor *actor,
+ ClutterPoint *focal_point,
+ gdouble factor);
+
+ /*< private >*/
+ void (* _clutter_zoom_action1) (void);
+ void (* _clutter_zoom_action2) (void);
+ void (* _clutter_zoom_action3) (void);
+ void (* _clutter_zoom_action4) (void);
+ void (* _clutter_zoom_action5) (void);
+};
+
+CLUTTER_AVAILABLE_IN_1_12
+GType clutter_zoom_action_get_type (void) G_GNUC_CONST;
+
+CLUTTER_AVAILABLE_IN_1_12
+ClutterAction * clutter_zoom_action_new (void);
+
+CLUTTER_AVAILABLE_IN_1_12
+void clutter_zoom_action_set_zoom_axis (ClutterZoomAction *action,
+ ClutterZoomAxis axis);
+CLUTTER_AVAILABLE_IN_1_12
+ClutterZoomAxis clutter_zoom_action_get_zoom_axis (ClutterZoomAction *action);
+
+CLUTTER_AVAILABLE_IN_1_12
+void clutter_zoom_action_get_focal_point (ClutterZoomAction *action,
+ ClutterPoint *point);
+CLUTTER_AVAILABLE_IN_1_12
+void clutter_zoom_action_get_transformed_focal_point (ClutterZoomAction *action,
+ ClutterPoint *point);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_ZOOM_ACTION_H__ */
diff --git a/clutter/clutter.h b/clutter/clutter.h
index 991bde3..e5bd24d 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -105,6 +105,7 @@
#include "clutter-transition.h"
#include "clutter-units.h"
#include "clutter-version.h"
+#include "clutter-zoom-action.h"
#include "clutter-enum-types.h"
diff --git a/clutter/clutter.symbols b/clutter/clutter.symbols
index 5315cab..261ac83 100644
--- a/clutter/clutter.symbols
+++ b/clutter/clutter.symbols
@@ -1607,3 +1607,10 @@ clutter_x11_trap_x_errors
clutter_x11_untrap_x_errors
clutter_x11_xinput_event_types_get_type
#endif
+clutter_zoom_action_get_focal_point
+clutter_zoom_action_get_transformed_focal_point
+clutter_zoom_action_get_type
+clutter_zoom_action_get_zoom_axis
+clutter_zoom_action_new
+clutter_zoom_action_set_zoom_axis
+clutter_zoom_axis_get_type
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
