summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in2
-rw-r--r--legacy/elementary/src/lib/elm_gesture_layer.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index a500e949e7..8830a9455c 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -12719,6 +12719,8 @@ extern "C" {
12719 12719
12720 Evas_Coord mx; /**< Momentum on X */ 12720 Evas_Coord mx; /**< Momentum on X */
12721 Evas_Coord my; /**< Momentum on Y */ 12721 Evas_Coord my; /**< Momentum on Y */
12722
12723 unsigned int n; /**< Number of fingers */
12722 }; 12724 };
12723 12725
12724 /** 12726 /**
diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c
index 0c5ba5e1d1..8fd85246a6 100644
--- a/legacy/elementary/src/lib/elm_gesture_layer.c
+++ b/legacy/elementary/src/lib/elm_gesture_layer.c
@@ -174,7 +174,6 @@ struct _Momentum_Type
174 unsigned int t_st_y; /* Time start on Y */ 174 unsigned int t_st_y; /* Time start on Y */
175 unsigned int t_end; /* Time end */ 175 unsigned int t_end; /* Time end */
176 unsigned int t_up; /* Recent up event time */ 176 unsigned int t_up; /* Recent up event time */
177 int n_fingers;
178 int xdir, ydir; 177 int xdir, ydir;
179}; 178};
180typedef struct _Momentum_Type Momentum_Type; 179typedef struct _Momentum_Type Momentum_Type;
@@ -1729,10 +1728,11 @@ _momentum_test(Evas_Object *obj, Pointer_Event *pe,
1729 pe_local.y /= cnt; 1728 pe_local.y /= cnt;
1730 1729
1731 /* If user added finger - reset gesture */ 1730 /* If user added finger - reset gesture */
1732 if ((st->n_fingers) && (st->n_fingers < cnt)) 1731 if ((st->info.n) && (st->info.n < cnt))
1733 state_to_report = ELM_GESTURE_STATE_ABORT; 1732 state_to_report = ELM_GESTURE_STATE_ABORT;
1734 1733
1735 st->n_fingers = cnt; 1734 if (st->info.n < cnt)
1735 st->info.n = cnt;
1736 1736
1737 Evas_Event_Flags ev_flag = EVAS_EVENT_FLAG_NONE; 1737 Evas_Event_Flags ev_flag = EVAS_EVENT_FLAG_NONE;
1738 switch (event_type) 1738 switch (event_type)