summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorAharon Hillel <a.hillel@partner.samsung.com>2011-10-30 10:08:05 +0000
committerTom Hacohen <tom@stosb.com>2011-10-30 10:08:05 +0000
commit0aadefe6b2f694d09b98407bdc5827336ee77541 (patch)
tree7da37dc595f72346d5039cd27982e56170783530 /legacy
parent170cf5fa1aa552868a4c39213b4f7d311d419cdc (diff)
Elm Glayer: Removed finger count from line-info
Signed-off-by: Aharon Hillel <a.hillel@partner.samsung.com> SVN revision: 64521
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in1
-rw-r--r--legacy/elementary/src/lib/elm_gesture_layer.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 8830a9455c..8b2e3e8b88 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -12738,7 +12738,6 @@ extern "C" {
12738 struct _Elm_Gesture_Line_Info 12738 struct _Elm_Gesture_Line_Info
12739 { /* Report line ends, timestamps, and momentum computed */ 12739 { /* Report line ends, timestamps, and momentum computed */
12740 Elm_Gesture_Momentum_Info momentum; /**< Line momentum info */ 12740 Elm_Gesture_Momentum_Info momentum; /**< Line momentum info */
12741 unsigned int n; /**< Number of fingers (lines) */
12742 /* FIXME should be radians, bot degrees */ 12741 /* FIXME should be radians, bot degrees */
12743 double angle; /**< Angle (direction) of lines */ 12742 double angle; /**< Angle (direction) of lines */
12744 }; 12743 };
diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c
index 8fd85246a6..2362d2657c 100644
--- a/legacy/elementary/src/lib/elm_gesture_layer.c
+++ b/legacy/elementary/src/lib/elm_gesture_layer.c
@@ -1712,8 +1712,8 @@ _momentum_test(Evas_Object *obj, Pointer_Event *pe,
1712 /* First make avarage of all touched devices to determine center point */ 1712 /* First make avarage of all touched devices to determine center point */
1713 Eina_List *l; 1713 Eina_List *l;
1714 Pointer_Event *p; 1714 Pointer_Event *p;
1715 Pointer_Event pe_local = *pe; /* Copy pe event info to local */ 1715 Pointer_Event pe_local = *pe; /* Copy pe event info to local */
1716 int cnt = 1; /* We start counter counting current pe event */ 1716 unsigned int cnt = 1; /* We start counter counting current pe event */
1717 EINA_LIST_FOREACH(wd->touched, l, p) 1717 EINA_LIST_FOREACH(wd->touched, l, p)
1718 if (p->device != pe_local.device) 1718 if (p->device != pe_local.device)
1719 { 1719 {
@@ -2089,7 +2089,7 @@ _n_line_test(Evas_Object *obj, Pointer_Event *pe, void *event_info,
2089 } 2089 }
2090 } 2090 }
2091 2091
2092 st->info.n = started; 2092 st->info.momentum.n = started;
2093 2093
2094 2094
2095 if (ended && 2095 if (ended &&