hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=cf3ad3a914e2a7e8c5a92d55a0be4dc2b7c566c4

commit cf3ad3a914e2a7e8c5a92d55a0be4dc2b7c566c4
Author: ChunEon Park <[email protected]>
Date:   Sat Feb 28 14:21:59 2015 +0900

    lib/edj_viewer: fix the cursor position scale to view scale
---
 src/lib/edj_viewer.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index eb917fd..d54cb98 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -129,11 +129,19 @@ rect_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
    Evas_Coord x, y, w, h;
    evas_object_geometry_get(obj, &x, &y, &w, &h);
 
-   cursor.x = ev->cur.canvas.x - x;
-   cursor.y = ev->cur.canvas.y - y;
    cursor.relx = (float) ((ev->cur.canvas.x - x) / (float) w);
    cursor.rely = (float) ((ev->cur.canvas.y - y) / (float) h);
 
+   if (vd->view_config_size.w > 0)
+     cursor.x = (((double)vd->view_config_size.w) * cursor.relx);
+   else
+     cursor.x = (ev->cur.canvas.x - x);
+
+   if (vd->view_config_size.h > 0)
+     cursor.y = (((double)vd->view_config_size.h) * cursor.rely);
+   else
+     cursor.y = (ev->cur.canvas.y - y);
+
    evas_object_smart_callback_call(vd->enventor, SIG_LIVE_VIEW_CURSOR_MOVED,
                                    &cursor);
 }

-- 


Reply via email to