From e554991a905e920f4df034a0fd6ce0c64904faa2 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Tue, 9 Jul 2013 12:54:36 +0900 Subject: [PATCH] Fix the type of timestamp for feeding mouse event. Invalid type is used for feeding mouse event to the "evas" canvas. Change-Id: I1e9d913730addedecc21f6ea90f78846e029c79e --- packaging/liblivebox-edje.spec | 2 +- src/script_port.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packaging/liblivebox-edje.spec b/packaging/liblivebox-edje.spec index 38c3829..6a0bafe 100644 --- a/packaging/liblivebox-edje.spec +++ b/packaging/liblivebox-edje.spec @@ -1,6 +1,6 @@ Name: liblivebox-edje Summary: EDJE Script loader for the data provider master -Version: 0.5.12 +Version: 0.5.13 Release: 1 Group: HomeTF/Livebox License: Flora License diff --git a/src/script_port.c b/src/script_port.c index ca77c35..ced64e7 100644 --- a/src/script_port.c +++ b/src/script_port.c @@ -219,10 +219,10 @@ static void activate_cb(void *data, Evas_Object *part_obj, Elm_Object_Item *item } DbgPrint("Cursor is on %dx%d\n", x, y); - evas_event_feed_mouse_move(e, x, y, timestamp, NULL); - evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, timestamp + 0.01f, NULL); - evas_event_feed_mouse_move(e, x, y, timestamp + 0.02f, NULL); - evas_event_feed_mouse_up(e, 1, EVAS_BUTTON_NONE, timestamp + 0.03f, NULL); + evas_event_feed_mouse_move(e, x, y, timestamp * 1000, NULL); + evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, (timestamp + 0.01f) * 1000, NULL); + evas_event_feed_mouse_move(e, x, y, (timestamp + 0.02f) * 1000, NULL); + evas_event_feed_mouse_up(e, 1, EVAS_BUTTON_NONE, (timestamp + 0.03f) * 1000, NULL); } PUBLIC int script_update_text(void *h, Evas *e, const char *id, const char *part, const char *text) @@ -1088,21 +1088,21 @@ PUBLIC int script_feed_event(void *h, Evas *e, int event_type, int x, int y, int } else if (event_type & LB_SCRIPT_MOUSE_EVENT) { switch (event_type) { case LB_SCRIPT_MOUSE_DOWN: - evas_event_feed_mouse_move(e, x, y, timestamp, NULL); - evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, timestamp + 0.01f, NULL); + evas_event_feed_mouse_move(e, x, y, timestamp * 1000, NULL); + evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, (timestamp + 0.01f) * 1000, NULL); break; case LB_SCRIPT_MOUSE_MOVE: - evas_event_feed_mouse_move(e, x, y, timestamp, NULL); + evas_event_feed_mouse_move(e, x, y, timestamp * 1000, NULL); break; case LB_SCRIPT_MOUSE_UP: - evas_event_feed_mouse_move(e, x, y, timestamp, NULL); - evas_event_feed_mouse_up(e, 1, EVAS_BUTTON_NONE, timestamp + 0.1f, NULL); + evas_event_feed_mouse_move(e, x, y, timestamp * 1000, NULL); + evas_event_feed_mouse_up(e, 1, EVAS_BUTTON_NONE, (timestamp + 0.1f) * 1000, NULL); break; case LB_SCRIPT_MOUSE_IN: - evas_event_feed_mouse_in(e, timestamp, NULL); + evas_event_feed_mouse_in(e, timestamp * 1000, NULL); break; case LB_SCRIPT_MOUSE_OUT: - evas_event_feed_mouse_out(e, timestamp, NULL); + evas_event_feed_mouse_out(e, timestamp * 1000, NULL); break; default: return LB_STATUS_ERROR_INVALID; -- 2.7.4