aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_callbacks.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_callbacks.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_callbacks.c')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 6baef3eead..3487543617 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -48,8 +48,8 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
EVAS_OBJECT_EVENT_FREE,
EFL_EVENT_KEY_DOWN,
EFL_EVENT_KEY_UP,
- EFL_CANVAS_OBJECT_EVENT_FOCUS_IN,
- EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT,
+ EFL_EVENT_FOCUS_IN,
+ EFL_EVENT_FOCUS_OUT,
EFL_GFX_EVENT_SHOW,
EFL_GFX_EVENT_HIDE,
EFL_GFX_EVENT_MOVE,
@@ -93,7 +93,8 @@ typedef enum {
EFL_EVENT_TYPE_STRUCT,
EFL_EVENT_TYPE_POINTER,
EFL_EVENT_TYPE_KEY,
- EFL_EVENT_TYPE_HOLD
+ EFL_EVENT_TYPE_HOLD,
+ EFL_EVENT_TYPE_FOCUS
} Efl_Event_Info_Type;
typedef struct
@@ -147,6 +148,10 @@ _evas_event_efl_event_info_type(Evas_Callback_Type type)
case EVAS_CALLBACK_DEVICE_CHANGED: /* Efl.Input.Device */
return EFL_EVENT_TYPE_OBJECT;
+ case EVAS_CALLBACK_FOCUS_IN:
+ case EVAS_CALLBACK_FOCUS_OUT:
+ return EFL_EVENT_TYPE_FOCUS;
+
default:
return EFL_EVENT_TYPE_NULL;
}
@@ -164,6 +169,7 @@ _eo_evas_object_cb(void *data, const Efl_Event *event)
if (!info->func) return;
evas = evas_object_evas_get(event->object);
+ event_info = event->info;
switch (info->efl_event_type)
{
case EFL_EVENT_TYPE_POINTER:
@@ -178,12 +184,13 @@ _eo_evas_object_cb(void *data, const Efl_Event *event)
event_info = efl_input_hold_legacy_info_fill(efl_event_info, &event_flags);
break;
+ case EFL_EVENT_TYPE_FOCUS:
+ event_info = NULL;
case EFL_EVENT_TYPE_NULL:
case EFL_EVENT_TYPE_STRUCT:
case EFL_EVENT_TYPE_OBJECT:
- info->func(info->data, evas, event->object, event->info);
+ info->func(info->data, evas, event->object, event_info);
return;
-
default: return;
}