[PATCH weston v2 02/16] zoom: remove unused args from weston_zoom_transition

Pekka Paalanen ppaalanen at gmail.com
Tue Mar 10 06:01:33 PDT 2015


From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Also remove the now dead code from weston_output_update_zoom().

Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
 src/zoom.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/zoom.c b/src/zoom.c
index 16d487d..c70a70c 100644
--- a/src/zoom.c
+++ b/src/zoom.c
@@ -121,7 +121,7 @@ weston_output_update_zoom_transform(struct weston_output *output)
 }
 
 static void
-weston_zoom_transition(struct weston_output *output, wl_fixed_t x, wl_fixed_t y)
+weston_zoom_transition(struct weston_output *output)
 {
 	if (output->zoom.level != output->zoom.spring_z.current) {
 		output->zoom.spring_z.target = output->zoom.level;
@@ -140,15 +140,11 @@ WL_EXPORT void
 weston_output_update_zoom(struct weston_output *output)
 {
 	struct weston_seat *seat = weston_zoom_pick_seat(output->compositor);
-	wl_fixed_t x = seat->pointer->x;
-	wl_fixed_t y = seat->pointer->y;
-
-	zoom_area_center_from_pointer(output, &x, &y);
 
 	output->zoom.current.x = seat->pointer->x;
 	output->zoom.current.y = seat->pointer->y;
 
-	weston_zoom_transition(output, x, y);
+	weston_zoom_transition(output);
 	weston_output_update_zoom_transform(output);
 }
 
-- 
2.0.5



More information about the wayland-devel mailing list