From 3fce2ab36d60777c99d2f7d4fdccbb05b9d98209 Mon Sep 17 00:00:00 2001 From: Jehun Lim Date: Thu, 9 Apr 2015 15:13:49 +0900 Subject: [PATCH] add BACK key handling in plugged layout Change-Id: I4c0e43b55be557234d797eb7076f2f78663e165d Signed-off-by: Jehun Lim --- src/view/plugged_layout.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/view/plugged_layout.cpp b/src/view/plugged_layout.cpp index 2bc2fa3..586a69a 100644 --- a/src/view/plugged_layout.cpp +++ b/src/view/plugged_layout.cpp @@ -48,7 +48,7 @@ struct SPluggedLayout { CSourceMgr *srcmgr; CViewMgr *vmgr; - SSigCallbackPair *SigCb; + SSigCallbackPair *sigCb; SPluggedLayout() { memset(this, 0, sizeof(SPluggedLayout)); @@ -113,7 +113,7 @@ bool CPluggedLayout::Create(CLayoutMgr *lmgr, void *data) m->srcmgr = srcmgr; m->vmgr = vmgr; - m->SigCb = (SSigCallbackPair *)data; + m->sigCb = (SSigCallbackPair *)data; evas_object_data_set(m->base, PLUGGED_DATA, m); @@ -164,7 +164,7 @@ void CPluggedLayout::m_DrawNoContentArea(void) elm_object_part_content_unset(Layout(), PART_CONTENT_CONTENT); evas_object_hide(m->grid); - m->SigCb->cb(m->SigCb->cookie, E_RETURN); + m->sigCb->cb(m->sigCb->cookie, E_RETURN); } void CPluggedLayout::m_DrawContentArea(void) @@ -301,7 +301,9 @@ void CPluggedLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key if (!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_REMOTE)) m->vmgr->PushView(MENU_VIEW, si); - + else if (!strcmp(ev->keyname, KEY_BACK) + || !strcmp(ev->keyname, KEY_BACK_REMOTE)) + m->sigCb->cb(m->sigCb->cookie, E_RETURN); break; default: break; @@ -324,7 +326,7 @@ void CPluggedLayout::OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_M elm_object_item_focus_set(it, EINA_TRUE); - m->SigCb->cb(m->SigCb->cookie, E_HIGHLIGHT); + m->sigCb->cb(m->sigCb->cookie, E_HIGHLIGHT); break; default: @@ -360,7 +362,7 @@ void CPluggedLayout::OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item) { switch (id) { case PLUGGED_GRID: - m->SigCb->cb(m->SigCb->cookie, E_HIGHLIGHT); + m->sigCb->cb(m->sigCb->cookie, E_HIGHLIGHT); break; default: -- 2.7.4