summaryrefslogtreecommitdiff
path: root/src/lib/elementary
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/lib/elementary
parentb3ffd78237282883c327082c841205f2f0643642 (diff)
input: Move pointer props to Canvas
efl_input_pointer_position is defined by two classes... bad! Fixes T6066
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_win.c8
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
2 files changed, 7 insertions, 7 deletions
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)
2423} 2423}
2424 2424
2425EOLIAN static Eina_Position2D 2425EOLIAN static Eina_Position2D
2426_efl_ui_win_efl_input_interface_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 2426_efl_ui_win_efl_canvas_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
2427{ 2427{
2428 Eina_Position2D pos; 2428 Eina_Position2D pos;
2429 evas_pointer_canvas_xy_get(sd->evas, &pos.x, &pos.y); 2429 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
2431} 2431}
2432 2432
2433EOLIAN static Eina_Bool 2433EOLIAN static Eina_Bool
2434_efl_ui_win_efl_input_interface_pointer_inside_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 2434_efl_ui_win_efl_canvas_pointer_inside_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
2435{ 2435{
2436 return evas_pointer_inside_get(sd->evas); 2436 return evas_pointer_inside_get(sd->evas);
2437} 2437}
@@ -2467,8 +2467,8 @@ _input_pointer_iterator_free(Input_Pointer_Iterator *it)
2467} 2467}
2468 2468
2469EOLIAN static Eina_Iterator * 2469EOLIAN static Eina_Iterator *
2470_efl_ui_win_efl_input_interface_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd, 2470_efl_ui_win_efl_canvas_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd,
2471 Eina_Bool hover EINA_UNUSED) 2471 Eina_Bool hover EINA_UNUSED)
2472{ 2472{
2473 Input_Pointer_Iterator *it; 2473 Input_Pointer_Iterator *it;
2474 Eina_List *list = NULL; 2474 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,
849 Efl.Gfx.Size.Hint.hint_aspect { set; } 849 Efl.Gfx.Size.Hint.hint_aspect { set; }
850 Efl.Gfx.Size.Hint.hint_max { set; } 850 Efl.Gfx.Size.Hint.hint_max { set; }
851 Efl.Text.text { get; set; } 851 Efl.Text.text { get; set; }
852 Efl.Input.Interface.pointer_position { get; } 852 Efl.Canvas.pointer_position { get; }
853 Efl.Input.Interface.pointer_inside { get; } 853 Efl.Canvas.pointer_inside { get; }
854 Efl.Input.Interface.pointer_iterate; 854 Efl.Canvas.pointer_iterate;
855 Efl.Canvas.image_max_size { get; } 855 Efl.Canvas.image_max_size { get; }
856 Efl.Canvas.smart_objects_calculate; 856 Efl.Canvas.smart_objects_calculate;
857 Efl.Canvas.objects_at_xy_get; 857 Efl.Canvas.objects_at_xy_get;