Add PhotoLayout, VideoLayout, MusicLayout code and layout change code

[profile/tv/apps/native/filebrowser.git] / src / layouts / FbAllLayout.cpp

diff --git a/src/layouts/FbAllLayout.cpp b/src/layouts/FbAllLayout.cpp
index 2575eb7..9f8a4e6 100644 (file)
--- a/src/layouts/FbAllLayout.cpp
+++ b/src/layouts/FbAllLayout.cpp
@@ -93,6 +93,7 @@ bool CFbAllLayout::t_CreateFileGrid(Evas_Object *layout)
        cb.cbLinkApp = sm_CbLinkApp;
        cb.cookie = m->eoBase;
        if (!m->pFileGrid->Create(m->eoWin, layout, &cb)) {
+               _DBG("Fail to create FileGrid");
                delete m->pFileGrid;
                m->pFileGrid = NULL;
                return false;
@@ -112,12 +113,21 @@ void CFbAllLayout::t_DestroyFileGrid(void)
 }
 
 
+void CFbAllLayout::t_OnShow(void)
+{
+       elm_object_part_content_unset(m->eoBase, FBR_PART_CONTENT);
+       elm_object_part_content_set(m->eoBase, FBR_PART_CONTENT, Layout()); 
+       m->pFileGrid->Update(false);
+       CBaseLayout::t_OnShow();
+}
+
+
 bool CFbAllLayout::Create(CLayoutMgr *mgr, void *data)
 {
        ASSERT(!m);
        ASSERT(mgr);
-       
-       Evas_Object *layout = NULL;
+
+       Evas_Object* layout = NULL;
 
        _CREATE_BEGIN{
                _CHECK(m = new SFbAllLayout)
@@ -128,7 +138,10 @@ bool CFbAllLayout::Create(CLayoutMgr *mgr, void *data)
                _CHECK(layout = elm_layout_add(m->eoBase))
                _CHECK(elm_layout_file_set(layout, EDJEFILE, FB_ALL_LAYOUT))
                _CHECK(t_CreateFileGrid(layout))
-               _COMMAND{ elm_object_part_content_set(m->eoBase, FBR_PART_CONTENT, layout); }
+               _COMMAND{ 
+                       elm_object_part_content_unset(m->eoBase, FBR_PART_CONTENT);
+                       elm_object_part_content_set(m->eoBase, FBR_PART_CONTENT, layout); 
+               }
                _CHECK(CBaseLayout::Create(layout))
 
                _WHEN_SUCCESS{}
@@ -159,15 +172,6 @@ void CFbAllLayout::Destroy(void)
 }
 
 
-void CFbAllLayout::Update(bool flag)
-{
-       ASSERT(m);
-       _DBG();
-
-       m->pFileGrid->Update(flag);
-}
-
-
 void CFbAllLayout::SetFocus(Eina_Bool flag)
 {
        ASSERT(m);
@@ -177,14 +181,6 @@ void CFbAllLayout::SetFocus(Eina_Bool flag)
 }
 
 
-Evas_Object* CFbAllLayout::Grid(void)
-{
-       ASSERT(m);
-       
-       return m->pFileGrid->Grid();
-}
-
-
 void CFbAllLayout::Action(void)
 {
        ASSERT(m);