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

Convert wl_fixed_t to int in weston_output_update_zoom().

Browse Source 
This way, we don't have to use wl_fixed_to_int() for each
call to weston_output_update_zoom(). It accepts wl_fixed_t
types and converts internally.
This commit is contained in:
Scott Moreau 2012-05-16 08:36:42 -06:00 committed by Kristian Høgsberg
parent 0b61130bae
commit dc549932b7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compositor.c
View File

@ -2356,13 +2356,17 @@ weston_output_destroy(struct weston_output *output)
}
WL_EXPORT void
weston_output_update_zoom(struct weston_output *output, int x, int y)
weston_output_update_zoom(struct weston_output *output, wl_fixed_t fx, wl_fixed_t fy)
{
float ratio;
int32_t x, y;
if (output->zoom.level <= 0)
return;
x = wl_fixed_to_int(fx);
y = wl_fixed_to_int(fy);
output->zoom.magnification = 1 / output->zoom.level;
ratio = 1 - (1 / output->zoom.magnification);

4
src/shell.c
View File

@ -1642,9 +1642,7 @@ zoom_binding(struct wl_input_device *device, uint32_t time,
if (output->zoom.level < output->zoom.increment)
output->zoom.level = output->zoom.increment;
weston_output_update_zoom(output,
wl_fixed_to_int(device->x),
wl_fixed_to_int(device->y));
weston_output_update_zoom(output, device->x, device->y);
}
}
}