enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm_button: apply key binding 

Summary: This patch applies key binding to elm_button.

Test Plan: elementary_test > Button > check key events

Reviewers: Hermet, raster

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D646
This commit is contained in:
Jaeun Choi 2014-03-22 14:31:49 +09:00 committed by ChunEon Park
parent 68b66830b4
commit d6acf211cc
3 changed files with 78 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
legacy/elementary/config/default/base.src
View File

@ -246,6 +246,38 @@ group "Elm_Config" struct {
}
}
group "bindings" list {
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Button";
group "key_bindings" list {
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "modifiers" string: "None";
value "key" string: "Return";
value "action" string: "activate";
value "params" string: "";
value "any_mod" uchar: 1;
value "no_string" uchar: 0;
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "modifiers" string: "None";
value "key" string: "KP_Enter";
value "action" string: "activate";
value "params" string: "";
value "any_mod" uchar: 1;
value "no_string" uchar: 0;
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "modifiers" string: "None";
value "key" string: "space";
value "action" string: "activate";
value "params" string: "";
value "any_mod" uchar: 1;
value "no_string" uchar: 0;
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Panel";
group "key_bindings" list {

32
legacy/elementary/config/standard/base.src
View File

@ -247,6 +247,38 @@ group "Elm_Config" struct {
}
}
group "bindings" list {
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Button";
group "key_bindings" list {
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "modifiers" string: "None";
value "key" string: "Return";
value "action" string: "activate";
value "params" string: "";
value "any_mod" uchar: 1;
value "no_string" uchar: 0;
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "modifiers" string: "None";
value "key" string: "KP_Enter";
value "action" string: "activate";
value "params" string: "";
value "any_mod" uchar: 1;
value "no_string" uchar: 0;
}
group "Elm_Config_Binding_Key" struct {
value "context" int: 0;
value "modifiers" string: "None";
value "key" string: "space";
value "action" string: "activate";
value "params" string: "";
value "any_mod" uchar: 1;
value "no_string" uchar: 0;
}
}
}
group "Elm_Config_Bindings_Widget" struct {
value "name" string: "Elm_Panel";
group "key_bindings" list {

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

@ -41,6 +41,13 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] =
{NULL, NULL}
};
static void _key_action_activate(Evas_Object *obj, const char *params);
static const Elm_Action key_actions[] = {
{"activate", _key_action_activate},
{NULL, NULL}
};
static void
_activate(Evas_Object *obj)
{
@ -149,6 +156,12 @@ _elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
return EINA_TRUE;
}
static void _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
{
elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
_activate(obj);
}
EOLIAN static Eina_Bool
_elm_button_elm_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
{
@ -159,13 +172,7 @@ _elm_button_elm_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Obj
if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
if ((strcmp(ev->key, "Return")) &&
(strcmp(ev->key, "KP_Enter")) &&
(strcmp(ev->key, "space")))
return EINA_FALSE;
elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
_activate(obj);
_elm_config_key_binding_call(obj, ev, key_actions);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE;