From 12d69346b2adf902fcf87576d7c8c98cc61b0e2e Mon Sep 17 00:00:00 2001 From: JengHyun Kang Date: Fri, 12 May 2017 14:31:24 +0900 Subject: [PATCH] fix a incorrect array usage - base_point's index is same as finger index. but currently 0 index is used to 1st finger. so fixed it to 1 index is used to 1st finger. Change-Id: I4f7f72837c07409c68b0609e59074907506739ab --- src/e_mod_gesture_events.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/e_mod_gesture_events.c b/src/e_mod_gesture_events.c index 41c9954..6b92137 100644 --- a/src/e_mod_gesture_events.c +++ b/src/e_mod_gesture_events.c @@ -821,8 +821,8 @@ _e_gesture_process_tap_move(Ecore_Event_Mouse_Move *ev) { int diff_x, diff_y; - diff_x = gesture->gesture_events.base_point[ev->multi.device].axis.x - ev->x; - diff_y = gesture->gesture_events.base_point[ev->multi.device].axis.y - ev->y; + diff_x = gesture->gesture_events.base_point[ev->multi.device + 1].axis.x - ev->x; + diff_y = gesture->gesture_events.base_point[ev->multi.device + 1].axis.y - ev->y; if (ABS(diff_x) > E_GESTURE_TAP_MOVING_RANGE || ABS(diff_y) > E_GESTURE_TAP_MOVING_RANGE) @@ -895,9 +895,9 @@ _e_gesture_process_mouse_button_down(void *event) return E_GESTURE_EVENT_STATE_PROPAGATE; } - gesture->gesture_events.base_point[ev->multi.device].pressed = EINA_TRUE; - gesture->gesture_events.base_point[ev->multi.device].axis.x = ev->x; - gesture->gesture_events.base_point[ev->multi.device].axis.y = ev->y; + gesture->gesture_events.base_point[ev->multi.device + 1].pressed = EINA_TRUE; + gesture->gesture_events.base_point[ev->multi.device + 1].axis.x = ev->x; + gesture->gesture_events.base_point[ev->multi.device + 1].axis.y = ev->y; if (gesture->gesture_events.recognized_gesture) { @@ -946,9 +946,9 @@ _e_gesture_process_mouse_button_up(void *event) return E_GESTURE_EVENT_STATE_PROPAGATE; } - gesture->gesture_events.base_point[ev->multi.device].pressed = EINA_FALSE; - gesture->gesture_events.base_point[ev->multi.device].axis.x = 0; - gesture->gesture_events.base_point[ev->multi.device].axis.y = 0; + gesture->gesture_events.base_point[ev->multi.device + 1].pressed = EINA_FALSE; + gesture->gesture_events.base_point[ev->multi.device + 1].axis.x = 0; + gesture->gesture_events.base_point[ev->multi.device + 1].axis.y = 0; if (!(gesture->gesture_filter & TIZEN_GESTURE_TYPE_EDGE_SWIPE)) { @@ -998,12 +998,12 @@ _e_gesture_process_mouse_move(void *event) return E_GESTURE_EVENT_STATE_PROPAGATE; } - if (gesture->gesture_events.base_point[ev->multi.device].pressed != EINA_TRUE) + if (gesture->gesture_events.base_point[ev->multi.device + 1].pressed != EINA_TRUE) { return gesture->event_state; } - gesture->gesture_events.base_point[ev->multi.device].axis.x = ev->x; - gesture->gesture_events.base_point[ev->multi.device].axis.y = ev->y; + gesture->gesture_events.base_point[ev->multi.device + 1].axis.x = ev->x; + gesture->gesture_events.base_point[ev->multi.device + 1].axis.y = ev->y; if (!(gesture->gesture_filter & TIZEN_GESTURE_TYPE_EDGE_SWIPE)) { -- 2.7.4