[PATCH weston 3/6] zoom: Rename zoom_area_center_from_pointer to zoom_area_center_from_point

Derek Foreman derekf at osg.samsung.com
Fri Jan 9 10:45:16 PST 2015


It doesn't do anything with a pointer, and zoom can be initiated by the
keyboard, so the name was a little confusing.

Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 src/zoom.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/zoom.c b/src/zoom.c
index 2728fbe..dc92ee4 100644
--- a/src/zoom.c
+++ b/src/zoom.c
@@ -99,8 +99,8 @@ weston_zoom_frame_xy(struct weston_animation *animation,
 }
 
 static void
-zoom_area_center_from_pointer(struct weston_output *output,
-				wl_fixed_t *x, wl_fixed_t *y)
+zoom_area_center_from_point(struct weston_output *output,
+			    wl_fixed_t *x, wl_fixed_t *y)
 {
 	float level = output->zoom.spring_z.current;
 	wl_fixed_t offset_x = wl_fixed_from_int(output->x);
@@ -129,7 +129,7 @@ weston_output_update_zoom_transform(struct weston_output *output)
 		return;
 
 	if (wl_list_empty(&output->zoom.animation_xy.link))
-		zoom_area_center_from_pointer(output, &x, &y);
+		zoom_area_center_from_point(output, &x, &y);
 
 	global_x = wl_fixed_to_double(x);
 	global_y = wl_fixed_to_double(y);
@@ -179,8 +179,8 @@ weston_output_update_zoom(struct weston_output *output)
 	wl_fixed_t y = seat->pointer->y;
 
 	assert(output->zoom.active);
-	zoom_area_center_from_pointer(output, &x, &y);
 
+	zoom_area_center_from_point(output, &x, &y);
 	if (wl_list_empty(&output->zoom.animation_xy.link)) {
 		output->zoom.current.x = seat->pointer->x;
 		output->zoom.current.y = seat->pointer->y;
-- 
2.1.4



More information about the wayland-devel mailing list