enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Efl.Canvas.Object: Multi-seat API should not be exposed to legacy. 

Summary: This new kind of APIs should be EO only.

Reviewers: jpeg, cedric, barbieri, bdilly, stefan_schmidt

Reviewed By: cedric, barbieri

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4696

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Guilherme Iscaro 2017-03-02 11:06:15 -08:00 committed by Cedric BAIL
parent 3f5e1b4e1e
commit 347c75fbe3
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/edje/edje_entry.c
View File

@ -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);

4
src/lib/edje/edje_program.c
View File

@ -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);
}
}

18
src/lib/evas/canvas/efl_canvas_object.eo
View File

@ -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 {