mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zoom: remove temporary variables

Browse Source 
Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Giulio Camuffo 2015-10-08 19:13:01 +03:00 committed by Derek Foreman
parent 6850e7b9e1
commit c5a011f1e0
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/zoom.c
View File

@ -68,19 +68,14 @@ zoom_area_center_from_point(struct weston_output *output,
double *x, double *y) double *x, double *y)
{ {
float level = output->zoom.spring_z.current; float level = output->zoom.spring_z.current;
double offset_x = output->x;
double offset_y = output->y;
double w = output->width;
double h = output->height;
*x = (*x - offset_x) * level + w / 2; *x = (*x - output->x) * level + output->width / 2.;
*y = (*y - offset_y) * level + h / 2; *y = (*y - output->y) * level + output->height / 2.;
} }
static void static void
weston_output_update_zoom_transform(struct weston_output *output) weston_output_update_zoom_transform(struct weston_output *output)
{ {
float global_x, global_y;
double x = output->zoom.current.x; /* global pointer coords */ double x = output->zoom.current.x; /* global pointer coords */
double y = output->zoom.current.y; double y = output->zoom.current.y;
float level; float level;
@ -93,11 +88,8 @@ weston_output_update_zoom_transform(struct weston_output *output)
zoom_area_center_from_point(output, &x, &y); zoom_area_center_from_point(output, &x, &y);
global_x = x; output->zoom.trans_x = x - output->width / 2;
global_y = y; output->zoom.trans_y = y - output->height / 2;
output->zoom.trans_x = global_x - output->width / 2;
output->zoom.trans_y = global_y - output->height / 2;
if (output->zoom.trans_x < 0) if (output->zoom.trans_x < 0)
output->zoom.trans_x = 0; output->zoom.trans_x = 0;