fixed for compatibility for wrong multi-touch events from Evas

Change-Id: I03d9c3b1891162a7a7b626414a87447dc9d5af3c

diff --git a/capi-maps-service.changes b/capi-maps-service.changes
index ac23101861e144e1ac974082aaea8f17b4d79545..5df1fd294dd85ae959b08a94d69ae5bc0cceac3e 100644 (file)
--- a/capi-maps-service.changes
+++ b/capi-maps-service.changes
@@ -1,3 +1,8 @@
+[Version]   capi-maps-service_0.6.3
+[Date]      24 Aug 2016
+[Title]     fixed for compatibility for wrong multi-touch events from Evas
+[Developer] Seechan Kim <cbible.kim@samsung.com>
+
 [Version]   capi-maps-service_0.6.2
 [Date]      22 June 2016
 [Title]     added to check network.internet feature of wearable target

diff --git a/packaging/capi-maps-service.spec b/packaging/capi-maps-service.spec
index bcd575775381da0ddd925839d7a1e4b4bb5a0c59..cf4caf04fd7c82be75f3db89ece3747a7800053d 100644 (file)
--- a/packaging/capi-maps-service.spec
+++ b/packaging/capi-maps-service.spec
@@ -1,6 +1,6 @@
 Name:       capi-maps-service
 Summary:    Tizen Maps Service API
-Version:    0.6.2
+Version:    0.6.3
 Release:    1
 Group:      Location/API
 License:    Apache-2.0

diff --git a/src/view/gesture_detector_statemachine.cpp b/src/view/gesture_detector_statemachine.cpp
index 64a8c8f5be880b0b77a40bf671277375f7ad3510..20e3ff0fc6c9e24522c8e004a86ceb1b6785a800 100644 (file)
--- a/src/view/gesture_detector_statemachine.cpp
+++ b/src/view/gesture_detector_statemachine.cpp
@@ -52,11 +52,11 @@ void view::gesture_detector_statemachine::tap(int finger_no,
                state_machine_on_event(FINGER_DOWN);
                break;
 
-       case 1: /* Second finger pressed */
+       case 1: /* Second finger pressed */
                _info._finger_down[1] = tp;
-               _info._is_finger_pressed[1] = true;
                _info._finger_move[1] = tp;
                _info._prev_finger_down[1] = tp;
+               _info._is_finger_pressed[1] = true;
 
                _info._fingers_pressed = _info.calc_finger_pressed();
 

diff --git a/src/view/gesture_processor.cpp b/src/view/gesture_processor.cpp
index 0e3f7a380ddd1a8c6ec1052b3cae5ca36d77af0d..64b168bf0da121a9577dc91d95ba2535d3d412bf 100644 (file)
--- a/src/view/gesture_processor.cpp
+++ b/src/view/gesture_processor.cpp
@@ -871,7 +871,7 @@ void view::finger_event_stream::multi_tap(Evas_Event_Multi_Down *ev)
        if (!ev)
                return;
 
-       const int finger_no = ev->device;
+       const int finger_no = (ev->device > 0 ? 1 : 0);
        if (finger_no >= MAX_FINGERS)
                return;
 
@@ -900,7 +900,7 @@ void view::finger_event_stream::multi_move(Evas_Event_Multi_Move *ev)
        if (!ev)
                return;
 
-       const int finger_no = ev->device;
+       const int finger_no = (ev->device > 0 ? 1 : 0);
        if (finger_no >= MAX_FINGERS)
                return;
 
@@ -953,12 +953,12 @@ void view::finger_event_stream::multi_up(Evas_Event_Multi_Up *ev)
        if (!ev)
                return;
 
-       const int finger_no = ev->device;
+       const int finger_no = (ev->device > 0 ? 1 : 0);
        if (finger_no >= MAX_FINGERS)
                return;
 
        /* Process finger up */
-       _d->up(ev->device, view::touch_point(ev->canvas.x,
+       _d->up(finger_no, view::touch_point(ev->canvas.x,
                                            ev->canvas.y,
                                            ev->timestamp));