aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-25 18:47:49 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-26 17:58:07 +0900
commit8557fe818f6ac033f582dc4865235aa3176d7447 (patch)
tree03dd802b65648a98c2bc2d9a9ff79e5ec2cf4455 /src/tests
parentelm: rename Elm.Interface.Atspi.Text => Efl.Access.Text (diff)
downloadefl-8557fe818f6ac033f582dc4865235aa3176d7447.tar.gz
input: Move pointer props to Canvas
efl_input_pointer_position is defined by two classes... bad! Fixes https://phab.enlightenment.org/T6066
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/elementary/elm_test_win.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index ea469e1107..b8524b323f 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -256,7 +256,7 @@ _inputs_timer2_cb(void *data)
size_t cnt = 0;
int i = 0;
- it = efl_input_pointer_iterate(win, 0);
+ it = efl_canvas_pointer_iterate(win, 0);
EINA_ITERATOR_FOREACH(it, ptr)
{
double x, y;
@@ -313,12 +313,13 @@ static Eina_Bool
_inputs_timer3_cb(void *data)
{
Efl_Input_Pointer *ptr;
+ Eina_Position2D pos;
Eina_Iterator *it;
Eo *win = data;
size_t cnt = 0;
int i = 0;
- it = efl_input_pointer_iterate(win, 0);
+ it = efl_canvas_pointer_iterate(win, 0);
EINA_ITERATOR_FOREACH(it, ptr)
{
int tool, ok = 0;
@@ -348,6 +349,11 @@ _inputs_timer3_cb(void *data)
eina_iterator_free(it);
fail_if(cnt != 2); // 2 moves (in the list), 2 ups (gone)
+ fail_if(!efl_canvas_pointer_inside_get(win));
+ pos = efl_canvas_pointer_position_get(win);
+ ck_assert_int_eq(pos.x, points[1][0].x);
+ ck_assert_int_eq(pos.y, points[1][0].y);
+
elm_exit();
return ECORE_CALLBACK_DONE;