isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 20:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

zoom-action: improve zooming behavior

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=698674
This commit is contained in:
Lionel Landwerlin 2013-04-23 17:52:22 -07:00
parent 221fa225b3
commit 9cb6276255
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
clutter/clutter-zoom-action.c
View File

@ -81,6 +81,7 @@ struct _ClutterZoomActionPrivate
ZoomPoint points[2]; ZoomPoint points[2];
ClutterPoint initial_focal_point;
ClutterPoint focal_point; ClutterPoint focal_point;
ClutterPoint transformed_focal_point; ClutterPoint transformed_focal_point;
@ -176,6 +177,18 @@ clutter_zoom_action_gesture_begin (ClutterGestureAction *action,
&priv->initial_scale_x, &priv->initial_scale_x,
&priv->initial_scale_y); &priv->initial_scale_y);
priv->initial_focal_point.x = (priv->points[0].start_x + priv->points[1].start_x) / 2;
priv->initial_focal_point.y = (priv->points[0].start_y + priv->points[1].start_y) / 2;
clutter_actor_transform_stage_point (actor,
priv->initial_focal_point.x,
priv->initial_focal_point.y,
&priv->transformed_focal_point.x,
&priv->transformed_focal_point.y);
clutter_actor_set_pivot_point (actor,
priv->transformed_focal_point.x / clutter_actor_get_width (actor),
priv->transformed_focal_point.y / clutter_actor_get_height (actor));
return TRUE; return TRUE;
} }
@ -200,11 +213,6 @@ clutter_zoom_action_gesture_progress (ClutterGestureAction *action,
priv->focal_point.x = (priv->points[0].update_x + priv->points[1].update_x) / 2; 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->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; new_scale = distance / priv->zoom_initial_distance;
@ -235,11 +243,16 @@ clutter_zoom_action_real_zoom (ClutterZoomAction *action,
gdouble factor) gdouble factor)
{ {
ClutterZoomActionPrivate *priv = action->priv; ClutterZoomActionPrivate *priv = action->priv;
ClutterActor *parent = clutter_actor_get_parent (actor);
gfloat x, y, z; gfloat x, y, z;
gdouble scale_x, scale_y; gdouble scale_x, scale_y;
ClutterVertex out, in; ClutterVertex out, in;
in.x = priv->transformed_focal_point.x;
in.y = priv->transformed_focal_point.y;
in.z = 0;
clutter_actor_apply_transform_to_point (actor, &in, &out);
clutter_actor_get_scale (actor, &scale_x, &scale_y); clutter_actor_get_scale (actor, &scale_x, &scale_y);
switch (priv->zoom_axis) switch (priv->zoom_axis)
@ -260,21 +273,10 @@ clutter_zoom_action_real_zoom (ClutterZoomAction *action,
break; break;
} }
x = priv->initial_x + priv->focal_point.x - priv->initial_focal_point.x;
in.x = priv->transformed_focal_point.x; y = priv->initial_y + priv->focal_point.y - priv->initial_focal_point.y;
in.y = priv->transformed_focal_point.y; clutter_actor_get_translation (actor, NULL, NULL, &z);
in.z = 0; clutter_actor_set_translation (actor, x, y, z);
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; return TRUE;
} }