[clutter/clutter-1.20] device-manager-xi2: Fix scaling of coordinates



commit 1222fcebec3b75a5492c29a73edbed5de2b77ec3
Author: Jonas Danielsson <jonas threetimestwo org>
Date:   Fri Jan 9 05:06:32 2015 -0500

    device-manager-xi2: Fix scaling of coordinates
    
    Do not CLAMP to width/height before applying the scale factor
    we will lose all information we need to scale properly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730815
    (cherry picked from commit 9660b001f7ee410bcbff545989a708b103e6faaf)
    Signed-off-by: Emmanuele Bassi <ebassi gnome org>

 clutter/x11/clutter-device-manager-xi2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index aef0bd6..b3d84fe 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -673,8 +673,8 @@ translate_coords (ClutterStageX11 *stage_x11,
 
   clutter_actor_get_size (stage, &stage_width, &stage_height);
 
-  *x_out = CLAMP (event_x, 0, stage_width)  / stage_x11->scale_factor;
-  *y_out = CLAMP (event_y, 0, stage_height) / stage_x11->scale_factor;
+  *x_out = CLAMP (event_x / stage_x11->scale_factor, 0, stage_width);
+  *y_out = CLAMP (event_y / stage_x11->scale_factor, 0, stage_height);
 }
 
 static gdouble


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]