From 611a39c212da104cee3d97a1a6f423642bcafa51 Mon Sep 17 00:00:00 2001 From: Hyunho Kang Date: Tue, 24 Oct 2017 10:53:25 +0900 Subject: [PATCH] Apply flick only for watch app Big widgets need scroll event Change-Id: I2e1294eeddaf348e2f4ce22e623f6da27ea6132e Signed-off-by: Hyunho Kang --- .../src/screen_connector_toolkit_evas.c | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/screen_connector_watcher_evas/src/screen_connector_toolkit_evas.c b/screen_connector_watcher_evas/src/screen_connector_toolkit_evas.c index ab2b953..1c2ca59 100644 --- a/screen_connector_watcher_evas/src/screen_connector_toolkit_evas.c +++ b/screen_connector_watcher_evas/src/screen_connector_toolkit_evas.c @@ -635,7 +635,9 @@ static void __rs_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even LOGD("mouse down: %d %d", ev->canvas.x - x, ev->canvas.y - y); toolkit_evas_h->flick = false; - toolkit_evas_h->prev_y = ev->canvas.y - y; + + if (toolkit_evas_h->screen_type == SCREEN_CONNECTOR_SCREEN_TYPE_WATCH) + toolkit_evas_h->prev_y = ev->canvas.y - y; if (desc == NULL) desc = ""; @@ -844,7 +846,6 @@ static void __rs_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *even int h; struct tizen_remote_surface *surface; int delta_y; - Evas_Device_Class cls; evas_object_geometry_get(obj, &x, &y, &w, &h); @@ -865,22 +866,23 @@ static void __rs_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *even return; } - cls = evas_device_class_get(ev->dev); - if (cls != EVAS_DEVICE_CLASS_MOUSE && toolkit_evas_h->flick) { - LOGD("flick event"); - return; - } + if (toolkit_evas_h->screen_type == SCREEN_CONNECTOR_SCREEN_TYPE_WATCH) { + if (toolkit_evas_h->flick) { + LOGD("flick event"); + return; + } - delta_y = ev->cur.canvas.y - y - toolkit_evas_h->prev_y; - if (delta_y < 0) - delta_y *= -1; + delta_y = ev->cur.canvas.y - y - toolkit_evas_h->prev_y; + if (delta_y < 0) + delta_y *= -1; - if (delta_y > 10) { - toolkit_evas_h->flick = true; - return; + if (delta_y > 10) { + toolkit_evas_h->flick = true; + return; + } + toolkit_evas_h->prev_y = ev->cur.canvas.y - y; } - toolkit_evas_h->prev_y = ev->cur.canvas.y - y; tizen_remote_surface_transfer_mouse_event(surface, TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_MOVE, 0, @@ -891,7 +893,7 @@ static void __rs_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *even wl_fixed_from_double(ev->radius_y), wl_fixed_from_double(ev->pressure), wl_fixed_from_double(ev->angle), - cls, + evas_device_class_get(ev->dev), evas_device_subclass_get(ev->dev), desc, ev->timestamp); -- 2.7.4