forked from enlightenment/efl
tests/gesture: change random momentum cb to be useful momentum cb
verify that we get 1 event here and also that callback removal works Differential Revision: https://phab.enlightenment.org/D11220
This commit is contained in:
parent
3011e5ed11
commit
cd9b56b714
|
@ -65,13 +65,6 @@ gesture_cb(void *data , const Efl_Event *ev)
|
||||||
count[efl_gesture_state_get(g) - 1]++;
|
count[efl_gesture_state_get(g) - 1]++;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
test_cb(void *data EINA_UNUSED , const Efl_Event *ev EINA_UNUSED)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static Eo *
|
static Eo *
|
||||||
setup(void)
|
setup(void)
|
||||||
{
|
{
|
||||||
|
@ -85,8 +78,6 @@ setup(void)
|
||||||
rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
|
rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
|
||||||
efl_content_set(win, rect);
|
efl_content_set(win, rect);
|
||||||
|
|
||||||
/* add extra random cb to verify that we aren't getting double events */
|
|
||||||
efl_event_callback_add(rect, EFL_EVENT_GESTURE_MOMENTUM, test_cb, NULL);
|
|
||||||
#define WATCH(type) \
|
#define WATCH(type) \
|
||||||
efl_event_callback_add(rect, EFL_EVENT_GESTURE_##type, gesture_cb, &count[(type)])
|
efl_event_callback_add(rect, EFL_EVENT_GESTURE_##type, gesture_cb, &count[(type)])
|
||||||
WATCH(TAP);
|
WATCH(TAP);
|
||||||
|
@ -268,9 +259,12 @@ EFL_END_TEST
|
||||||
|
|
||||||
EFL_START_TEST(test_efl_ui_gesture_flick)
|
EFL_START_TEST(test_efl_ui_gesture_flick)
|
||||||
{
|
{
|
||||||
int moves, i;
|
int moves, i, single = 0;
|
||||||
Eo *rect = setup();
|
Eo *rect = setup();
|
||||||
|
|
||||||
|
/* add extra random cb to verify that we get exactly 1 event */
|
||||||
|
efl_event_callback_add(rect, EFL_EVENT_GESTURE_MOMENTUM, (void*)event_callback_that_increments_an_int_when_called, &single);
|
||||||
|
|
||||||
/* basic flick */
|
/* basic flick */
|
||||||
drag_object(rect, 0, 0, 75, 0, EINA_FALSE);
|
drag_object(rect, 0, 0, 75, 0, EINA_FALSE);
|
||||||
/* canceled */
|
/* canceled */
|
||||||
|
@ -289,6 +283,9 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
|
||||||
|
|
||||||
RESET;
|
RESET;
|
||||||
|
|
||||||
|
efl_event_callback_del(rect, EFL_EVENT_GESTURE_MOMENTUM, (void*)event_callback_that_increments_an_int_when_called, &single);
|
||||||
|
ck_assert_int_ge(single, 0);
|
||||||
|
|
||||||
/* reverse flick */
|
/* reverse flick */
|
||||||
drag_object(rect, 75, 0, -75, 0, EINA_FALSE);
|
drag_object(rect, 75, 0, -75, 0, EINA_FALSE);
|
||||||
/* canceled */
|
/* canceled */
|
||||||
|
|
Loading…
Reference in New Issue