From 401d85158f03643e18227b51f2e6e7180dcd5de8 Mon Sep 17 00:00:00 2001 From: Hyojung Jo Date: Mon, 18 May 2015 13:24:00 +0900 Subject: [PATCH] Draw table items after launch done. Change-Id: Id3e3631328a00ab7caaa7f06ce7831fe0a27f598 Signed-off-by: Hyojung Jo --- src/layout/AppsBaseLayout.cpp | 21 ++++++++++++--------- src/view/AppsBaseView.cpp | 3 --- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/layout/AppsBaseLayout.cpp b/src/layout/AppsBaseLayout.cpp index 15d814c..c759717 100644 --- a/src/layout/AppsBaseLayout.cpp +++ b/src/layout/AppsBaseLayout.cpp @@ -604,14 +604,22 @@ Eina_List *CAppsBaseLayout::m_GetFavoriteList(void) { Eina_List *CAppsBaseLayout::m_GetCurrentMenuList(void) { ASSERT(m->currentMenu); - if (!strcmp(m->currentMenu, STR_APPS)) + if (!strcmp(m->currentMenu, STR_APPS)) { + if (!m->applist) { + pkgmgrinfo_appinfo_get_usr_installed_list( + (pkgmgrinfo_app_list_cb)sm_CbAppList, + getuid(), m); + m->applist = CSortMgr::Sort(m->applist, SORT_BY_NAME_AZ); + } + return m->applist; - else if (!strcmp(m->currentMenu, STR_WEB)) + } else if (!strcmp(m->currentMenu, STR_WEB)) { return m->weblist; - else if (!strcmp(m->currentMenu, STR_FAV)) + } else if (!strcmp(m->currentMenu, STR_FAV)) { return m_GetFavoriteList(); - else + } else { return m_GetCategoryList(); + } } void CAppsBaseLayout::m_SortTableContents(Eina_List *list) { @@ -703,16 +711,11 @@ void CAppsBaseLayout::m_LoadBrowsingTable(void) { m->eoTable = eoTable; m->max_y = APPS_TABLE_MAX_COL; } - _CHECK(pkgmgrinfo_appinfo_get_usr_installed_list( - (pkgmgrinfo_app_list_cb)sm_CbAppList, - getuid(), m) == PMINFO_R_OK) _WHEN_SUCCESS { - m->applist = CSortMgr::Sort(m->applist, SORT_BY_NAME_AZ); elm_object_content_set(eoScroller, eoTable); elm_object_part_content_set(m->eoBase, PART_APPTABLE, eoScroller); } - _CHECK_FAIL { /* pkgmgrinfo_appinfo_get_usr_installed_list */ } _CHECK_FAIL { /* Add table */ } _CHECK_FAIL { evas_object_del(eoScroller); } } _CREATE_END_AND_CATCH { return; } diff --git a/src/view/AppsBaseView.cpp b/src/view/AppsBaseView.cpp index c053fa5..43a00a3 100644 --- a/src/view/AppsBaseView.cpp +++ b/src/view/AppsBaseView.cpp @@ -243,7 +243,6 @@ bool CAppsBaseView::m_DrawLeftSection(void) { m->eoBtnMenu[i], ELM_FOCUS_LEFT); } - m->eoBtnFocusedMenu = m->eoBtnMenu[0]; elm_object_content_set(eoScroller, eoBox); elm_object_part_content_set(Base(), PART_MENU, eoScroller); @@ -290,8 +289,6 @@ bool CAppsBaseView::m_DrawFullView(void) { if (!m_DrawTopSection()) return false; - m->pAppsBaseLayout->Update(m->eoBtnFocusedMenu, m->sort_type); - return true; } -- 2.7.4