summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 17:55:50 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-19 10:51:48 +0900
commit686366a03b2352f81d6ea4a79c6608d1bd5e1590 (patch)
tree9eaa2abad9b78658b2313ea26009e6f17f36477a /src/lib/elementary/efl_ui_win.c
parentbfd9487b94a39421639a0c65fa2b43067cb090b6 (diff)
evas: Use Eina.Rect for object list functions
- objects_at_xy_get - object_top_at_xy_get - objects_in_rectangle_get - object_top_in_rectangle_get
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_win.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 967a3ed440..7cf004a405 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2489,31 +2489,31 @@ _efl_ui_win_efl_canvas_smart_objects_calculate(Eo *obj EINA_UNUSED, Efl_Ui_Win_D
2489} 2489}
2490 2490
2491EOLIAN static Eina_Iterator * 2491EOLIAN static Eina_Iterator *
2492_efl_ui_win_efl_canvas_objects_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int x, int y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2492_efl_ui_win_efl_canvas_objects_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2493{ 2493{
2494 Eina_List *objs = NULL; 2494 Eina_List *objs = NULL;
2495 objs = evas_objects_at_xy_get(sd->evas, x, y, include_pass_events_objects, include_hidden_objects); 2495 objs = evas_objects_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects);
2496 return eina_list_iterator_new(objs); 2496 return eina_list_iterator_new(objs); // FIXME: This leaks the list!
2497} 2497}
2498 2498
2499EOLIAN static Efl_Gfx * 2499EOLIAN static Efl_Gfx *
2500_efl_ui_win_efl_canvas_object_top_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int x, int y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2500_efl_ui_win_efl_canvas_object_top_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2501{ 2501{
2502 return evas_object_top_at_xy_get(sd->evas, x, y, include_pass_events_objects, include_hidden_objects); 2502 return evas_object_top_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects);
2503} 2503}
2504 2504
2505EOLIAN static Eina_Iterator * 2505EOLIAN static Eina_Iterator *
2506_efl_ui_win_efl_canvas_objects_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2506_efl_ui_win_efl_canvas_objects_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2507{ 2507{
2508 Eina_List *objs = NULL; 2508 Eina_List *objs = NULL;
2509 objs = evas_objects_in_rectangle_get(sd->evas, x, y, w, h, include_pass_events_objects, include_hidden_objects); 2509 objs = evas_objects_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects);
2510 return eina_list_iterator_new(objs); 2510 return eina_list_iterator_new(objs); // FIXME: This leaks the list!
2511} 2511}
2512 2512
2513EOLIAN static Efl_Gfx * 2513EOLIAN static Efl_Gfx *
2514_efl_ui_win_efl_canvas_object_top_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2514_efl_ui_win_efl_canvas_object_top_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2515{ 2515{
2516 return evas_object_top_in_rectangle_get(sd->evas, x, y, w, h, include_pass_events_objects, include_hidden_objects); 2516 return evas_object_top_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects);
2517} 2517}
2518 2518
2519EOLIAN static Efl_Input_Device * 2519EOLIAN static Efl_Input_Device *