rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "key binding: define Elm_Action function as having a return type of Eina_Bool"" 

This reverts commit 0c32a3fcf13f0c43747c478f012df259e987c156.

now this can be pushed since second merge window for 1.10 is open
This commit is contained in:
ChunEon Park 2014-03-31 21:28:05 +09:00
parent 44c96c3efd
commit 8f5332f7c4
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/src/lib/elm_button.c
View File

@ -41,7 +41,7 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] =
{NULL, NULL} {NULL, NULL}
}; };
static void _key_action_activate(Evas_Object *obj, const char *params); static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
static const Elm_Action key_actions[] = { static const Elm_Action key_actions[] = {
{"activate", _key_action_activate}, {"activate", _key_action_activate},
@ -156,10 +156,12 @@ _elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
return EINA_TRUE; return EINA_TRUE;
} }
static void _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) static Eina_Bool
_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
{ {
elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
_activate(obj); _activate(obj);
return EINA_TRUE;
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool

5
legacy/elementary/src/lib/elm_config.c
View File

@ -2167,10 +2167,7 @@ _elm_config_key_binding_call(Evas_Object *obj,
while (actions[i].name) while (actions[i].name)
{ {
if (!strcmp(binding->action, actions[i].name)) if (!strcmp(binding->action, actions[i].name))
{ return actions[i].func(obj, binding->params);
actions[i].func(obj, binding->params);
return EINA_TRUE;
}
i++; i++;
} }
break; break;

6
legacy/elementary/src/lib/elm_panel.c
View File

@ -20,7 +20,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{NULL, NULL} {NULL, NULL}
}; };
void _key_action_toggle(Evas_Object *obj, const char *params); static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params);
static const Elm_Action key_actions[] = { static const Elm_Action key_actions[] = {
{"toggle", _key_action_toggle}, {"toggle", _key_action_toggle},
@ -237,9 +237,11 @@ _panel_toggle(void *data EINA_UNUSED,
edje_object_message_signal_process(wd->resize_obj); edje_object_message_signal_process(wd->resize_obj);
} }
void _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) static Eina_Bool
_key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
{ {
_panel_toggle(NULL, obj, NULL, NULL); _panel_toggle(NULL, obj, NULL, NULL);
return EINA_TRUE;
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool

2
legacy/elementary/src/lib/elm_widget.h
View File

@ -508,7 +508,7 @@ struct _Elm_Access_Info
struct _Elm_Action struct _Elm_Action
{ {
const char *name; const char *name;
void (*func)(Evas_Object *obj, const char *params); Eina_Bool (*func)(Evas_Object *obj, const char *params);
}; };
void _elm_access_shutdown(); void _elm_access_shutdown();