From df2b76dcc1527f56f7135ca417e32dbebe714d9d Mon Sep 17 00:00:00 2001 From: Jaeun Choi Date: Thu, 10 Apr 2014 11:14:59 +0900 Subject: [PATCH] naviframe: apply key binding Summary: This patch applies key binding to elc_naviframe. Test Plan: elementary_test > Naviframe > check key events Reviewers: Hermet Differential Revision: https://phab.enlightenment.org/D709 --- legacy/elementary/config/default/base.src | 14 +++++++++ legacy/elementary/config/mobile/base.src | 14 +++++++++ legacy/elementary/config/standard/base.src | 14 +++++++++ legacy/elementary/src/lib/elc_naviframe.c | 36 ++++++++++++++-------- 4 files changed, 66 insertions(+), 12 deletions(-) diff --git a/legacy/elementary/config/default/base.src b/legacy/elementary/config/default/base.src index 77890e92d1..6268d1b736 100644 --- a/legacy/elementary/config/default/base.src +++ b/legacy/elementary/config/default/base.src @@ -647,5 +647,19 @@ group "Elm_Config" struct { } } } + group "Elm_Config_Bindings_Widget" struct { + value "name" string: "Elc_Naviframe"; + group "key_bindings" list { + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "modifiers" string: "None"; + value "key" string: "BackSpace"; + value "action" string: "top_item_get"; + value "params" string: ""; + value "any_mod" uchar: 1; + value "no_string" uchar: 0; + } + } + } } } diff --git a/legacy/elementary/config/mobile/base.src b/legacy/elementary/config/mobile/base.src index abe3c2ba25..bd4361ad92 100644 --- a/legacy/elementary/config/mobile/base.src +++ b/legacy/elementary/config/mobile/base.src @@ -651,5 +651,19 @@ group "Elm_Config" struct { } } } + group "Elm_Config_Bindings_Widget" struct { + value "name" string: "Elc_Naviframe"; + group "key_bindings" list { + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "modifiers" string: "None"; + value "key" string: "BackSpace"; + value "action" string: "top_item_get"; + value "params" string: ""; + value "any_mod" uchar: 1; + value "no_string" uchar: 0; + } + } + } } } diff --git a/legacy/elementary/config/standard/base.src b/legacy/elementary/config/standard/base.src index b6071b4a36..0cf27ebe6b 100644 --- a/legacy/elementary/config/standard/base.src +++ b/legacy/elementary/config/standard/base.src @@ -648,5 +648,19 @@ group "Elm_Config" struct { } } } + group "Elm_Config_Bindings_Widget" struct { + value "name" string: "Elc_Naviframe"; + group "key_bindings" list { + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "modifiers" string: "None"; + value "key" string: "BackSpace"; + value "action" string: "top_item_get"; + value "params" string: ""; + value "any_mod" uchar: 1; + value "no_string" uchar: 0; + } + } + } } } diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 5edba230ed..9b6220e0a6 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -39,6 +39,13 @@ static const char SIG_CLICKED[] = "clicked"; static void _on_item_back_btn_clicked(void *data, Evas_Object *obj, void *event_info EINA_UNUSED); +static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params); + +static const Elm_Action key_actions[] = { + {"top_item_get", _key_action_top_item_get}, + {NULL, NULL} +}; + static void _resize_object_reset(Evas_Object *obj, Elm_Naviframe_Item *it) { @@ -1370,23 +1377,13 @@ _elc_naviframe_evas_smart_show(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED) evas_object_show(VIEW(top)); } -EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_event(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +static Eina_Bool +_key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED) { Elm_Naviframe_Item *it; - (void)src; - Evas_Event_Key_Down *ev = event_info; - - if (elm_widget_disabled_get(obj)) return EINA_FALSE; - 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, "BackSpace")) return EINA_FALSE; - eo_do(obj, elm_obj_naviframe_top_item_get((Elm_Object_Item **)&it)); if (!it) return EINA_FALSE; - ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - //FIXME: Replace this below code to elm_naviframe_item_pop() at elm 2.0. ///Leave for compatibility. if (it->title_prev_btn) @@ -1395,6 +1392,21 @@ _elc_naviframe_elm_widget_event(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, Eva return EINA_TRUE; } +EOLIAN static Eina_Bool +_elc_naviframe_elm_widget_event(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +{ + (void)src; + Evas_Event_Key_Down *ev = event_info; + + if (elm_widget_disabled_get(obj)) return EINA_FALSE; + if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; + if (!_elm_config_key_binding_call(obj, ev, key_actions)) return EINA_FALSE; + + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + return EINA_TRUE; +} + EOLIAN static void _elc_naviframe_elm_widget_access(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, Eina_Bool is_access) {