summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/elementary/elm_test_focus_common.c12
-rw-r--r--src/tests/elementary/elm_test_focus_sub.c7
-rw-r--r--src/tests/elementary/focus_test.eo2
3 files changed, 9 insertions, 12 deletions
diff --git a/src/tests/elementary/elm_test_focus_common.c b/src/tests/elementary/elm_test_focus_common.c
index f75730b..896d86d 100644
--- a/src/tests/elementary/elm_test_focus_common.c
+++ b/src/tests/elementary/elm_test_focus_common.c
@@ -2,7 +2,7 @@
2 2
3#define Q(o,_x,_y,_w,_h) \ 3#define Q(o,_x,_y,_w,_h) \
4 do {\ 4 do {\
5 Eina_Rectangle rect = EINA_RECTANGLE_INIT; \ 5 Eina_Rect rect; \
6 rect.x = _x; \ 6 rect.x = _x; \
7 rect.y = _y; \ 7 rect.y = _y; \
8 rect.w = _w; \ 8 rect.w = _w; \
@@ -58,7 +58,7 @@ elm_focus_test_manager_new(Efl_Ui_Focus_Object **middle)
58//Test class implementation 58//Test class implementation
59 59
60typedef struct { 60typedef struct {
61 Eina_Rectangle rect; 61 Eina_Rect rect;
62 Eina_Bool focus; 62 Eina_Bool focus;
63} Focus_Test_Data; 63} Focus_Test_Data;
64 64
@@ -68,7 +68,7 @@ _focus_test_efl_object_constructor(Eo *obj, Focus_Test_Data *pd)
68 Eo *eo; 68 Eo *eo;
69 69
70 eo = efl_constructor(efl_super(obj, FOCUS_TEST_CLASS)); 70 eo = efl_constructor(efl_super(obj, FOCUS_TEST_CLASS));
71 eina_rectangle_coords_from(&pd->rect, 0, 0, 0, 0); 71 eina_rectangle_coords_from(&pd->rect.rect, 0, 0, 0, 0);
72 return eo; 72 return eo;
73} 73}
74 74
@@ -79,19 +79,19 @@ _focus_test_efl_ui_focus_object_focus_set(Eo *obj, Focus_Test_Data *pd, Eina_Boo
79 printf("Object %p now focused\n", obj); 79 printf("Object %p now focused\n", obj);
80} 80}
81 81
82EOLIAN static Eina_Rectangle 82EOLIAN static Eina_Rect
83_focus_test_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd) 83_focus_test_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
84{ 84{
85 return pd->rect; 85 return pd->rect;
86} 86}
87 87
88EOLIAN static void 88EOLIAN static void
89_focus_test_size(Eo *obj EINA_UNUSED, Focus_Test_Data *pd, Eina_Rectangle rect) 89_focus_test_size(Eo *obj EINA_UNUSED, Focus_Test_Data *pd, Eina_Rect rect)
90{ 90{
91 pd->rect = rect; 91 pd->rect = rect;
92} 92}
93 93
94EOLIAN static Eina_Rectangle 94EOLIAN static Eina_Rect
95_focus_test_efl_gfx_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd) 95_focus_test_efl_gfx_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
96{ 96{
97 return pd->rect; 97 return pd->rect;
diff --git a/src/tests/elementary/elm_test_focus_sub.c b/src/tests/elementary/elm_test_focus_sub.c
index 18042cb..32487de 100644
--- a/src/tests/elementary/elm_test_focus_sub.c
+++ b/src/tests/elementary/elm_test_focus_sub.c
@@ -6,13 +6,10 @@ typedef struct {
6} Focus_Test_Sub_Main_Data; 6} Focus_Test_Sub_Main_Data;
7 7
8 8
9EOLIAN static Eina_Rectangle 9EOLIAN static Eina_Rect
10_focus_test_sub_main_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Sub_Main_Data *pd EINA_UNUSED) 10_focus_test_sub_main_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Sub_Main_Data *pd EINA_UNUSED)
11{ 11{
12 Eina_Rectangle result; 12 return EINA_RECT(0, 0, 20, 20);
13 EINA_RECTANGLE_SET(&result, 0, 0, 20, 20);
14
15 return result;
16} 13}
17 14
18EOLIAN static Efl_Ui_Focus_Manager* 15EOLIAN static Efl_Ui_Focus_Manager*
diff --git a/src/tests/elementary/focus_test.eo b/src/tests/elementary/focus_test.eo
index 1ec326b..5227241 100644
--- a/src/tests/elementary/focus_test.eo
+++ b/src/tests/elementary/focus_test.eo
@@ -2,7 +2,7 @@ class Focus.Test(Efl.Object, Efl.Ui.Focus.Object, Efl.Gfx) {
2 methods { 2 methods {
3 size { 3 size {
4 params { 4 params {
5 rect : Eina.Rectangle; 5 rect : Eina.Rect;
6 } 6 }
7 } 7 }
8 } 8 }