diff options
| author | Jonas Danielsson <jonas@threetimestwo.org> | 2015-01-09 05:06:32 -0500 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-01-09 11:47:32 +0000 |
| commit | 1222fcebec3b75a5492c29a73edbed5de2b77ec3 (patch) | |
| tree | 0979816ffd98a11982af1d9016670fdb1db13f6d | |
| parent | ddacf33909e0b8d310483f534bbd536fdb5ed26e (diff) | |
| download | clutter-1222fcebec3b75a5492c29a73edbed5de2b77ec3.tar.gz | |
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>
| -rw-r--r-- | 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 aef0bd666..b3d84fe8b 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 |