X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fviews%2Fcategory-layout.cpp;h=88c1585f3617364c1fd057a6b827ce6104d13c00;hb=302fefcfa514a520b679737906d82d97710f44b7;hp=9f92c4ddff2195cecad04c6dabae909cf9ad1d3b;hpb=186d8cc527da54c0ff8417ce5537f9188c474744;p=profile%2Ftv%2Fapps%2Fnative%2Fmusicplayer.git diff --git a/src/views/category-layout.cpp b/src/views/category-layout.cpp index 9f92c4d..88c1585 100644 --- a/src/views/category-layout.cpp +++ b/src/views/category-layout.cpp @@ -341,7 +341,7 @@ void CCategoryLayout::sm_CbSelectlistItemSelect(void *data, Evas_Object *obj, vo } -void CCategoryLayout::m_OnSelectlistItemSelect(Evas_Object *obj, void *event_info) +void CCategoryLayout::m_OnSelectlistItemSelect(Evas_Object *obj, Elm_Object_Item *event_info) { SCatItemInfo *itinfo = NULL; int tc; @@ -955,7 +955,7 @@ Evas_Object *CCategoryLayout::m_AddGrid(void) EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_gengrid_align_set(grid, 0, 0); - Connect(grid, CATEGORY_LAYOUT_GENGRID, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | TYPE_REALIZED | TYPE_UNREALIZED); + Connect(grid, CATEGORY_LAYOUT_GENGRID, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | TYPE_REALIZED | TYPE_UNREALIZED | TYPE_ACTIVATED); elm_gengrid_item_size_set(grid, elm_config_scale_get() * GENGRID_ITEM_SIZE_W, @@ -1175,7 +1175,7 @@ void CCategoryLayout::m_CreateSongList(void) EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_content_set(Layout(), MUSIC_PART_SONGLIST, genlist); - Connect(genlist, CATEGORY_LAYOUT_GENLIST, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN); + Connect(genlist, CATEGORY_LAYOUT_GENLIST, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN | TYPE_ACTIVATED); m->glist = genlist; @@ -1948,3 +1948,25 @@ void CCategoryLayout::OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *it break; } } + + +void CCategoryLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item) +{ + switch (id) { + case CATEGORY_LAYOUT_GENGRID: + m_OnItemSelect(item, NULL, NULL); + break; + + case CATEGORY_LAYOUT_GENLIST: + { + if (t.depth == E_DEPTH_SELECT_LIST) + m_OnSelectlistItemSelect(obj, item); + else + m_OnSongItemSelect(obj, item); + } + break; + + default: + break; + } +} \ No newline at end of file