forked from enlightenment/efl
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:
parent
3f5e1b4e1e
commit
347c75fbe3
|
@ -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_name = emission + sizeof("focus,part,in,") - 1;
|
||||||
seat = _edje_seat_get(ed, seat_name);
|
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);
|
ecore_imf_context_focus_in(en->imf_context);
|
||||||
_edje_entry_imf_cursor_info_set(en);
|
_edje_entry_imf_cursor_info_set(en);
|
||||||
|
|
|
@ -1062,7 +1062,7 @@ low_mem_current:
|
||||||
(rp->typedata.swallow)) &&
|
(rp->typedata.swallow)) &&
|
||||||
(rp->typedata.swallow->swallowed_object == focused))
|
(rp->typedata.swallow->swallowed_object == focused))
|
||||||
{
|
{
|
||||||
evas_object_seat_focus_del(focused, seat);
|
efl_canvas_object_seat_focus_del(focused, seat);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1079,7 +1079,7 @@ low_mem_current:
|
||||||
((rp->type == EDJE_RP_TYPE_SWALLOW) &&
|
((rp->type == EDJE_RP_TYPE_SWALLOW) &&
|
||||||
(rp->typedata.swallow)) &&
|
(rp->typedata.swallow)) &&
|
||||||
(rp->typedata.swallow->swallowed_object))
|
(rp->typedata.swallow->swallowed_object))
|
||||||
evas_object_seat_focus_add(
|
efl_canvas_object_seat_focus_add(
|
||||||
rp->typedata.swallow->swallowed_object, seat);
|
rp->typedata.swallow->swallowed_object, seat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,12 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
|
||||||
values {
|
values {
|
||||||
pointer_mode: Efl.Input.Object_Pointer_Mode; [[The pointer mode]]
|
pointer_mode: Efl.Input.Object_Pointer_Mode; [[The pointer mode]]
|
||||||
}
|
}
|
||||||
|
set {
|
||||||
|
legacy: null;
|
||||||
|
}
|
||||||
|
get {
|
||||||
|
legacy: null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@property pointer_mode {
|
@property pointer_mode {
|
||||||
[[Low-level pointer behaviour.
|
[[Low-level pointer behaviour.
|
||||||
|
@ -65,7 +71,9 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
|
||||||
|
|
||||||
@since 1.19
|
@since 1.19
|
||||||
]]
|
]]
|
||||||
get{}
|
get {
|
||||||
|
legacy: null;
|
||||||
|
}
|
||||||
values {
|
values {
|
||||||
in: bool; [[If $true the main pointer has entered this object.]]
|
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
|
@since 1.19
|
||||||
]]
|
]]
|
||||||
get {}
|
get {
|
||||||
|
legacy: null;
|
||||||
|
}
|
||||||
keys {
|
keys {
|
||||||
pointer: Efl.Input.Device; [[The pointer. Use $null for the defaul pointer]]
|
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
|
@since 1.19
|
||||||
]]
|
]]
|
||||||
get {
|
get {
|
||||||
|
legacy: null;
|
||||||
}
|
}
|
||||||
values {
|
values {
|
||||||
focus: bool; [[$true if focused by at least one seat or $false otherwise.]]
|
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 {
|
params {
|
||||||
@in seat: Efl.Input.Device; [[The seat to check if the object is focused. Use $null for the default seat.]]
|
@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.]]
|
return: bool; [[$true if focused or $false otherwise.]]
|
||||||
}
|
}
|
||||||
seat_focus_add {
|
seat_focus_add {
|
||||||
|
@ -303,6 +315,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
|
||||||
params {
|
params {
|
||||||
@in seat: Efl.Input.Device; [[The seat that should be added to the focus list. Use $null for the default seat.]]
|
@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.]]
|
return: bool; [[$true if the focus has been set or $false otherwise.]]
|
||||||
}
|
}
|
||||||
seat_focus_del {
|
seat_focus_del {
|
||||||
|
@ -315,6 +328,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
|
||||||
params {
|
params {
|
||||||
@in seat: Efl.Input.Device; [[The seat that should be removed from the focus list. Use $null for the default seat.]]
|
@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.]]
|
return: bool; [[$true if the seat was removed from the focus list or $false otherwise.]]
|
||||||
}
|
}
|
||||||
@property is_frame_object {
|
@property is_frame_object {
|
||||||
|
|
Loading…
Reference in New Issue