From a57e666ea02f7b0acfcfbd4bb5596d14ebb3ee3c Mon Sep 17 00:00:00 2001 From: Kim Tae Soo Date: Mon, 13 Apr 2015 11:51:54 +0900 Subject: [PATCH] Clean the source code Change-Id: I97822805b9009326e906c57b7005f2682758fca2 Signed-off-by: Kim Tae Soo --- src/views/entry-popup.cpp | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/views/entry-popup.cpp b/src/views/entry-popup.cpp index e77236a..d92147c 100644 --- a/src/views/entry-popup.cpp +++ b/src/views/entry-popup.cpp @@ -33,6 +33,10 @@ struct SEntryPopup { Ecore_Idler *idler; }; +enum EObject { + EO_ENTRY +}; + Eina_Bool CEntryPopup::sm_CbFocusIdler(void *dt) { @@ -104,7 +108,7 @@ bool CEntryPopup::Create(Evas_Object *base, const char *text, void(*cbEntryName) m->data = data; m->idler = ecore_idler_add(sm_CbFocusIdler, this); - Connect(entry); + Connect(entry, EO_ENTRY, TYPE_KEY_DOWN); return true; } @@ -140,13 +144,20 @@ void CEntryPopup::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Do if (!ev->keyname) return; - if (!strcmp(ev->keyname, KEY_BACK) || - !strcmp(ev->keyname, KEY_BACK_REMOTE)) - Destroy(); - else if (!strcmp(ev->keyname, KEY_ENTER) || - !strcmp(ev->keyname, KEY_ENTER_REMOTE)) { - str = elm_entry_entry_get(obj); - if (m->cbEntryName && str) - m->cbEntryName(m->data, str); + switch (id) { + case EO_ENTRY: + if (!strcmp(ev->keyname, KEY_BACK) || + !strcmp(ev->keyname, KEY_BACK_REMOTE)) + Destroy(); + else if (!strcmp(ev->keyname, KEY_ENTER) || + !strcmp(ev->keyname, KEY_ENTER_REMOTE)) { + str = elm_entry_entry_get(obj); + if (m->cbEntryName && str) + m->cbEntryName(m->data, str); + } + break; + + default: + break; } } -- 2.7.4