summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_main.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-10-31 16:30:43 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-01 11:22:33 +0900
commitb8ca1272aee00314ca2cfb10214f36590084f6f0 (patch)
tree254ffbef717c72e39a272d82546c35aaceb6e080 /src/lib/evas/canvas/evas_main.c
parentdaa15475865d0e77ef3aa0fb06b36226b7e7f11e (diff)
evas: Add seat argument to 'pointer_inside' (EO)
This merges pointer_inside and pointer_inside_by_device. Affects only EO.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/canvas/evas_main.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 3266af17ad..04c6cb06a7 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -634,9 +634,9 @@ _evas_canvas_pointer_button_down_mask_by_device_get(Eo *eo_e EINA_UNUSED,
634} 634}
635 635
636EOLIAN static Eina_Bool 636EOLIAN static Eina_Bool
637_evas_canvas_pointer_inside_by_device_get(Eo *eo_e EINA_UNUSED, 637_evas_canvas_efl_canvas_pointer_inside_get(Eo *eo_e EINA_UNUSED,
638 Evas_Public_Data *e, 638 Evas_Public_Data *e,
639 Efl_Input_Device *dev) 639 Eo *dev)
640{ 640{
641 Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev); 641 Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev);
642 if (!pdata) return EINA_FALSE; 642 if (!pdata) return EINA_FALSE;
@@ -661,12 +661,6 @@ _evas_canvas_pointer_button_down_mask_get(Eo *eo_e, Evas_Public_Data *e)
661 return _evas_canvas_pointer_button_down_mask_by_device_get(eo_e, e, NULL); 661 return _evas_canvas_pointer_button_down_mask_by_device_get(eo_e, e, NULL);
662} 662}
663 663
664EOLIAN static Eina_Bool
665_evas_canvas_efl_canvas_pointer_inside_get(Eo *eo_e, Evas_Public_Data *e)
666{
667 return _evas_canvas_pointer_inside_by_device_get(eo_e, e, NULL);
668}
669
670EOLIAN static void 664EOLIAN static void
671_evas_canvas_data_attach_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, void *data) 665_evas_canvas_data_attach_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, void *data)
672{ 666{
@@ -1300,7 +1294,13 @@ _evas_pointer_list_in_rect_get(Evas_Public_Data *edata, Evas_Object *obj,
1300EAPI Eina_Bool 1294EAPI Eina_Bool
1301evas_pointer_inside_get(const Evas *obj) 1295evas_pointer_inside_get(const Evas *obj)
1302{ 1296{
1303 return efl_canvas_pointer_inside_get(obj); 1297 return efl_canvas_pointer_inside_get(obj, NULL);
1298}
1299
1300EAPI Eina_Bool
1301evas_pointer_inside_by_device_get(const Evas *obj, Eo *dev)
1302{
1303 return efl_canvas_pointer_inside_get(obj, dev);
1304} 1304}
1305 1305
1306/* Internal EO APIs */ 1306/* Internal EO APIs */