aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_focus.c
diff options
context:
space:
mode:
authorGuilherme Iscaro <iscaro@profusion.mobi>2016-11-18 14:56:20 -0200
committerBruno Dilly <bdilly@profusion.mobi>2016-11-24 19:18:47 -0200
commit6572ad9e029a3b5d0ca25925419929e7c8dabdd9 (patch)
tree007cac750c0e84ac99f677b821044cf411bfc2b9 /src/lib/evas/canvas/evas_focus.c
parentEfl.Canvas: Use Efl.Input.Focus as event info for object,focus.in/out. (diff)
downloadefl-6572ad9e029a3b5d0ca25925419929e7c8dabdd9.tar.gz
Efl.Canvas.Object: Remove focus,in/out events.
Since this object already inherist Efl.Input.Interface there's no need to have those events reimplemented.
Diffstat (limited to 'src/lib/evas/canvas/evas_focus.c')
-rw-r--r--src/lib/evas/canvas/evas_focus.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index d65422a2b1..9269985073 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -69,7 +69,7 @@ _evas_focus_dispatch_event(Evas_Object_Protected_Data *obj, Efl_Input_Device *se
Efl_Input_Focus_Data *ev_data;
Efl_Input_Focus *evt;
Evas_Callback_Type cb_evas, cb_obj_evas;
- const Efl_Event_Description *efl_object_focus_event, *efl_object_focus_device_event;
+ const Efl_Event_Description *efl_object_focus_event;
evt = efl_input_instance_get(EFL_INPUT_FOCUS_CLASS, NULL, (void **) &ev_data);
if (!evt) return;
@@ -82,27 +82,20 @@ _evas_focus_dispatch_event(Evas_Object_Protected_Data *obj, Efl_Input_Device *se
{
cb_obj_evas = EVAS_CALLBACK_FOCUS_IN;
cb_evas = EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN;
- efl_object_focus_event = EFL_CANVAS_OBJECT_EVENT_FOCUS_IN;
- efl_object_focus_device_event = EFL_CANVAS_OBJECT_EVENT_FOCUS_DEVICE_IN;
+ efl_object_focus_event = EFL_EVENT_FOCUS_IN;
}
else
{
cb_obj_evas = EVAS_CALLBACK_FOCUS_OUT;
cb_evas = EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT;
- efl_object_focus_event = EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT;
- efl_object_focus_device_event = EFL_CANVAS_OBJECT_EVENT_FOCUS_DEVICE_OUT;
+ efl_object_focus_event = EFL_EVENT_FOCUS_OUT;
}
- if (seat == obj->layer->evas->default_seat)
- {
- evas_object_event_callback_call(obj->object, obj,
- cb_obj_evas,
- NULL, _evas_object_event_new(),
- efl_object_focus_event);
- }
- evas_event_callback_call(obj->layer->evas->evas,
- cb_evas, evt);
- efl_event_callback_call(obj->object, efl_object_focus_device_event, seat);
+ evas_object_event_callback_call(obj->object, obj,
+ cb_obj_evas,
+ evt, _evas_object_event_new(),
+ efl_object_focus_event);
+ evas_event_callback_call(obj->layer->evas->evas, cb_evas, evt);
efl_del(evt);
}