From effcac8ca06ef09656ac44afb22d217e98ebfca5 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Sat, 23 Mar 2013 16:02:12 +0900 Subject: [PATCH] naviframe - disable naviframe key event. need to check somewhere trigger the wrong "escape" event. Conflicts: packaging/elementary.spec --- packaging/elementary.spec | 2 +- src/lib/elc_naviframe.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/elementary.spec b/packaging/elementary.spec index 4bb6ab6..ffb2eaa 100755 --- a/packaging/elementary.spec +++ b/packaging/elementary.spec @@ -1,7 +1,7 @@ #sbs-git:slp/pkgs/e/elementary elementary 1.0.0+svn.70492slp2+build11 Name: elementary Summary: EFL toolkit for small touchscreens -Version: 1.7.1+svn.77535+build82r01 +Version: 1.7.1+svn.77535+build83 Release: 1 Group: System/Libraries License: LGPLv2.1 diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 7a3035a..65595d6 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -1355,6 +1355,8 @@ _elm_naviframe_smart_event(Evas_Object *obj, if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; +//Disable this temporary. Something trigger the "Escape" key event unnecessary. Need to check it. +/* if (strcmp(ev->keyname, "Escape")) return EINA_FALSE; it = elm_naviframe_top_item_get(obj); @@ -1364,7 +1366,7 @@ _elm_naviframe_smart_event(Evas_Object *obj, evas_object_smart_callback_call(it->title_prev_btn, SIG_CLICKED, NULL); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - +*/ return EINA_TRUE; } -- 2.7.4