forked from enlightenment/efl
efl_canvas_scene: rename event from focus,* to scene_focus,*
Summary: This event can just be renamed, no need to handle legacy. The reason for this, that this event is used to map to EVAS_CALLBACK_ enum fields, which means, the legacy names of the event does not matter. ref T7476 Reviewers: cedric, segfaultxavi, zmike, stefan_schmidt Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7476 Differential Revision: https://phab.enlightenment.org/D8242
This commit is contained in:
parent
c876ac52d9
commit
a007badbed
|
@ -2889,9 +2889,9 @@ _edje_entry_init(Edje *ed)
|
|||
_edje_key_down_cb, ed);
|
||||
evas_object_event_callback_add(ed->obj, EVAS_CALLBACK_KEY_UP,
|
||||
_edje_key_up_cb, ed);
|
||||
efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
|
||||
efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN,
|
||||
_evas_focus_in_cb, ed);
|
||||
efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
|
||||
efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT,
|
||||
_evas_focus_out_cb, ed);
|
||||
}
|
||||
|
||||
|
@ -2910,9 +2910,9 @@ _edje_entry_shutdown(Edje *ed)
|
|||
_edje_key_down_cb);
|
||||
evas_object_event_callback_del(ed->obj, EVAS_CALLBACK_KEY_UP,
|
||||
_edje_key_up_cb);
|
||||
efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
|
||||
efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN,
|
||||
_evas_focus_in_cb, ed);
|
||||
efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
|
||||
efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT,
|
||||
_evas_focus_out_cb, ed);
|
||||
}
|
||||
|
||||
|
|
|
@ -224,8 +224,8 @@ interface @beta Efl.Canvas.Scene
|
|||
}
|
||||
}
|
||||
events {
|
||||
focus,in: Efl.Input.Focus; [[Called when canvas got focus]]
|
||||
focus,out: Efl.Input.Focus; [[Called when canvas lost focus]]
|
||||
scene,focus,in: Efl.Input.Focus; [[Called when scene got focus]]
|
||||
scene,focus,out: Efl.Input.Focus; [[Called when scene lost focus]]
|
||||
object,focus,in: Efl.Input.Focus; [[Called when object got focus]]
|
||||
object,focus,out: Efl.Input.Focus; [[Called when object lost focus]]
|
||||
render,pre: void; [[Called when pre render happens]]
|
||||
|
|
|
@ -2025,7 +2025,7 @@ _elm_win_evas_focus_in(void *data,
|
|||
Eo *win = data;
|
||||
|
||||
_elm_win_throttle_ok = EINA_TRUE;
|
||||
efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_FOCUS_IN, NULL);
|
||||
efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -2035,7 +2035,7 @@ _elm_win_evas_focus_out(void *data,
|
|||
{
|
||||
Eo *win = data;
|
||||
|
||||
efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, NULL);
|
||||
efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -2170,13 +2170,13 @@ _win_event_add_cb(void *data, const Efl_Event *ev)
|
|||
evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE,
|
||||
_elm_win_evas_render_pre, win);
|
||||
}
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_IN)
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN)
|
||||
{
|
||||
if (!(sd->event_forward.focus_in++))
|
||||
evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN,
|
||||
_elm_win_evas_focus_in, win);
|
||||
}
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_OUT)
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT)
|
||||
{
|
||||
if (!(sd->event_forward.focus_out++))
|
||||
evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
|
||||
|
@ -2301,13 +2301,13 @@ _win_event_del_cb(void *data, const Efl_Event *ev)
|
|||
evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_PRE,
|
||||
_elm_win_evas_render_pre, win);
|
||||
}
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_IN)
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN)
|
||||
{
|
||||
if (!(--sd->event_forward.focus_in))
|
||||
evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_IN,
|
||||
_elm_win_evas_focus_in, win);
|
||||
}
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_OUT)
|
||||
else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT)
|
||||
{
|
||||
if (!(--sd->event_forward.focus_out))
|
||||
evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
|
||||
|
|
|
@ -57,8 +57,8 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
|
|||
EFL_EVENT_HOLD,
|
||||
EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
|
||||
EFL_GFX_IMAGE_EVENT_PRELOAD,
|
||||
EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
|
||||
EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
|
||||
EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN,
|
||||
EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT,
|
||||
EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE,
|
||||
EVAS_CANVAS_EVENT_RENDER_FLUSH_POST,
|
||||
EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN,
|
||||
|
|
Loading…
Reference in New Issue