Fix bug 42/35942/1 accepted/tizen/tv/20150226.104047 submit/tizen_tv/20150226.095926
authorKim Tae Soo <taesoo46.kim@samsung.com>
Thu, 26 Feb 2015 09:58:04 +0000 (18:58 +0900)
committerKim Tae Soo <taesoo46.kim@samsung.com>
Thu, 26 Feb 2015 09:58:04 +0000 (18:58 +0900)
Change-Id: I20f14ca1dec010ff6180bb5e67e5ba0ed2044c84
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>
src/views/category-layout.cpp

index 41cdf98..d7a345c 100644 (file)
@@ -130,6 +130,8 @@ void CCategoryLayout::m_OnFocusIdler(void)
 
        m->focus_idler = NULL;
 
+       elm_object_tree_focus_allow_set(t.base, EINA_TRUE);
+
        if (t.depth == E_DEPTH_CATEGORY) {
                it = m_FindItemByInfo(m->it_infolist, t.c_catinfo);
                if (!it) {
@@ -1366,13 +1368,11 @@ void CCategoryLayout::m_SortCatgrid(void)
 void CCategoryLayout::m_EmptyLayout(bool sort_flag)
 {
        if (t.grid) {
-               elm_gengrid_clear(t.grid);
                evas_object_del(t.grid);
                t.grid = NULL;
        }
 
        if (m->glist) {
-               elm_genlist_clear(m->glist);
                evas_object_del(m->glist);
                m->glist = NULL;
        }
@@ -1418,8 +1418,6 @@ void CCategoryLayout::m_EmptyLayout(bool sort_flag)
        if (m->albumCover)
                evas_object_del(m->albumCover);
        m->albumCover = NULL;
-
-       evas_object_hide(Layout());
 }
 
 
@@ -1514,6 +1512,8 @@ void CCategoryLayout::t_UpdateLayout(bool sort_flag)
 
 void CCategoryLayout::t_UpdateLayoutWithFocus(void)
 {
+       elm_object_tree_focus_allow_set(t.base, EINA_FALSE);
+
        t_UpdateLayout(false);
        evas_object_show(Layout());
        m_RemoveFocusIdler();
@@ -1540,6 +1540,8 @@ bool CCategoryLayout::Create(CLayoutMgr *mgr)
                return false;
        }
 
+       memset(&t, 0, sizeof(SCategoryLayoutProtected));
+
        vmgr = CViewMgr::GetInstance();
        if (!vmgr) {
                _ERR(" get view mgr failed ");