diff options
| author | Guilherme Iscaro <iscaro@profusion.mobi> | 2017-03-02 12:19:36 -0300 |
|---|---|---|
| committer | Guilherme Iscaro <iscaro@profusion.mobi> | 2017-03-02 13:42:48 -0300 |
| commit | f52c78dc9c8658c1be913eb42a78f32be9ea7a5d (patch) | |
| tree | 411eada6c82c63dc5da254346bfa8a071b97ea5f | |
| parent | 3f5e1b4e1e04a810349ef103a4d8cafc72f311dd (diff) | |
| download | efl-devs/iscaro/legacy_api.tar.gz | |
Efl.Canvas.Object: Multi-seat API should not be exposed to legacy.devs/iscaro/legacy_api
Summary: This new kind of APIs should be EO only.
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D4696
| -rw-r--r-- | src/lib/edje/edje_entry.c | 2 | ||||
| -rw-r--r-- | src/lib/edje/edje_program.c | 4 | ||||
| -rw-r--r-- | src/lib/evas/canvas/efl_canvas_object.eo | 18 |
3 files changed, 19 insertions, 5 deletions
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 2f59eae47c..14c400c2af 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -135,7 +135,7 @@ _edje_entry_focus_in_cb(void *data, Evas_Object *o, const char *emission, const seat_name = emission + sizeof("focus,part,in,") - 1; seat = _edje_seat_get(ed, seat_name); - if (evas_object_seat_focus_check(ed->obj, seat)) + if (efl_canvas_object_seat_focus_check(ed->obj, seat)) { ecore_imf_context_focus_in(en->imf_context); _edje_entry_imf_cursor_info_set(en); diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index 1482fa4c9c..25f8179bdc 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -1062,7 +1062,7 @@ low_mem_current: (rp->typedata.swallow)) && (rp->typedata.swallow->swallowed_object == focused)) { - evas_object_seat_focus_del(focused, seat); + efl_canvas_object_seat_focus_del(focused, seat); break; } } @@ -1079,7 +1079,7 @@ low_mem_current: ((rp->type == EDJE_RP_TYPE_SWALLOW) && (rp->typedata.swallow)) && (rp->typedata.swallow->swallowed_object)) - evas_object_seat_focus_add( + efl_canvas_object_seat_focus_add( rp->typedata.swallow->swallowed_object, seat); } } diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index c6583fa9b8..b152657be7 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -32,6 +32,12 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, values { pointer_mode: Efl.Input.Object_Pointer_Mode; [[The pointer mode]] } + set { + legacy: null; + } + get { + legacy: null; + } } @property pointer_mode { [[Low-level pointer behaviour. @@ -65,7 +71,9 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, @since 1.19 ]] - get{} + get { + legacy: null; + } values { in: bool; [[If $true the main pointer has entered this object.]] } @@ -79,7 +87,9 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, @since 1.19 ]] - get {} + get { + legacy: null; + } keys { pointer: Efl.Input.Device; [[The pointer. Use $null for the defaul pointer]] } @@ -274,6 +284,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, @since 1.19 ]] get { + legacy: null; } values { focus: bool; [[$true if focused by at least one seat or $false otherwise.]] @@ -284,6 +295,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, params { @in seat: Efl.Input.Device; [[The seat to check if the object is focused. Use $null for the default seat.]] } + legacy: null; return: bool; [[$true if focused or $false otherwise.]] } seat_focus_add { @@ -303,6 +315,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, params { @in seat: Efl.Input.Device; [[The seat that should be added to the focus list. Use $null for the default seat.]] } + legacy: null; return: bool; [[$true if the focus has been set or $false otherwise.]] } seat_focus_del { @@ -315,6 +328,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, params { @in seat: Efl.Input.Device; [[The seat that should be removed from the focus list. Use $null for the default seat.]] } + legacy: null; return: bool; [[$true if the seat was removed from the focus list or $false otherwise.]] } @property is_frame_object { |