Add PhotoLayout, VideoLayout, MusicLayout code and layout change code

[profile/tv/apps/native/filebrowser.git] / src / views / BaseView / FileGrid.cpp

diff --git a/src/views/BaseView/FileGrid.cpp b/src/views/BaseView/FileGrid.cpp
index d331e4d..ed95029 100644 (file)
--- a/src/views/BaseView/FileGrid.cpp
+++ b/src/views/BaseView/FileGrid.cpp
@@ -267,7 +267,7 @@ void CFileGrid::t_Empty(bool sort_flag)
                m->pGengridItemClass = NULL;
        }
 
-       if (sort_flag == false) {
+       if (sort_flag == false && m->elFile != NULL) {
                eina_list_free(m->elFile);
                m->elFile = NULL;
        }
@@ -444,7 +444,7 @@ void CFileGrid::OnKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Up *ev
        if(ev->keyname)
                _DBG("%s", ev->keyname);
 
-       if (strcmp(ev->keyname, KEY_BACK) == 0) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                if (m->depth == 0) {
                        if (m->callback.cbUnsetFocus)
                                m->callback.cbUnsetFocus(m->callback.cookie);
@@ -456,7 +456,20 @@ void CFileGrid::OnKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Up *ev
                        elm_object_item_focus_set(it, EINA_TRUE);
                }
        }
-       else if (strcmp(ev->keyname, KEY_MENU) == 0) {
+       else if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+               it = elm_object_focused_item_get(obj);
+               if (!it) {
+                       _ERR(" unable to get focused item ");
+                       return;
+               }
+               pItemInfo = _find_item_info(m->elItemInfo, it);
+               if (!pItemInfo)
+                       return;
+
+               m->handle_itinfo = pItemInfo;
+               m_HandleSelection();
+       }
+       else if (!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_REMOTE)) {
                it = elm_object_focused_item_get(obj);
                if (!it) {
                        _ERR(" unable to get focused item ");