From 8557fe818f6ac033f582dc4865235aa3176d7447 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 25 Sep 2017 18:47:49 +0900 Subject: input: Move pointer props to Canvas efl_input_pointer_position is defined by two classes... bad! Fixes T6066 --- src/lib/elementary/efl_ui_win.c | 8 ++++---- src/lib/elementary/efl_ui_win.eo | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/elementary') diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 06607a6ed6..bdf94c1e36 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2423,7 +2423,7 @@ _efl_ui_win_efl_gfx_visible_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool vis) } EOLIAN static Eina_Position2D -_efl_ui_win_efl_input_interface_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_efl_canvas_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { Eina_Position2D pos; evas_pointer_canvas_xy_get(sd->evas, &pos.x, &pos.y); @@ -2431,7 +2431,7 @@ _efl_ui_win_efl_input_interface_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Ui } EOLIAN static Eina_Bool -_efl_ui_win_efl_input_interface_pointer_inside_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_efl_canvas_pointer_inside_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { return evas_pointer_inside_get(sd->evas); } @@ -2467,8 +2467,8 @@ _input_pointer_iterator_free(Input_Pointer_Iterator *it) } EOLIAN static Eina_Iterator * -_efl_ui_win_efl_input_interface_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd, - Eina_Bool hover EINA_UNUSED) +_efl_ui_win_efl_canvas_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd, + Eina_Bool hover EINA_UNUSED) { Input_Pointer_Iterator *it; Eina_List *list = NULL; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 9a640f088e..f65f549932 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -849,9 +849,9 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, Efl.Gfx.Size.Hint.hint_aspect { set; } Efl.Gfx.Size.Hint.hint_max { set; } Efl.Text.text { get; set; } - Efl.Input.Interface.pointer_position { get; } - Efl.Input.Interface.pointer_inside { get; } - Efl.Input.Interface.pointer_iterate; + Efl.Canvas.pointer_position { get; } + Efl.Canvas.pointer_inside { get; } + Efl.Canvas.pointer_iterate; Efl.Canvas.image_max_size { get; } Efl.Canvas.smart_objects_calculate; Efl.Canvas.objects_at_xy_get; -- cgit v1.2.1