[Title] hide the redundunt delete button when the folder item is sweeped.

[Issue#] N_SE-8354
[Problem] delete button shows two times when the folder item is sweepted.
[Cause] folder item should have just 2 buttons when it is sweeped
[Solution] hiding the button.
[Team] Browser UI
[Developer] sangpyo7.kim
[Request] N/A

Change-Id: I8ed25f9f75344706b0867210d45f95174fce3701

Conflicts:

	src/browser-bookmark/browser-bookmark-view.cpp

diff --git a/src/browser-bookmark/browser-bookmark-view.cpp b/src/browser-bookmark/browser-bookmark-view.cpp
index 360bdaf..30a522b 100755 (executable)
--- a/src/browser-bookmark/browser-bookmark-view.cpp
+++ b/src/browser-bookmark/browser-bookmark-view.cpp
@@ -253,9 +253,16 @@ void Browser_Bookmark_View::return_to_bookmark_view(int added_bookmark_id)
                                genlist = m_sub_folder_genlist;
 
                        item->user_data_1 = (void *)this;
-                       item->user_data_2 = (void *)elm_genlist_item_append(genlist, &m_bookmark_genlist_item_class,
+                       if (item->is_folder) {
+                               item->user_data_2 = (void *)elm_genlist_item_append(genlist, &m_folder_genlist_item_class,
+                                                                       item, NULL, ELM_GENLIST_ITEM_NONE,
+                                                                       __bookmark_item_clicked_cb, this);
+
+                       } else {
+                               item->user_data_2 = (void *)elm_genlist_item_append(genlist, &m_bookmark_genlist_item_class,
                                                                        item, NULL, ELM_GENLIST_ITEM_NONE,
                                                                        __bookmark_item_clicked_cb, this);
+                       }
 
                        if (item->parent == BROWSER_BOOKMARK_MAIN_FOLDER_ID)
                                m_main_folder_list.push_back(item);
@@ -266,9 +273,15 @@ void Browser_Bookmark_View::return_to_bookmark_view(int added_bookmark_id)
                        /* If the current folder is sub folder but the saved folder is main folder,
                          * add the saved bookmark item to main folder. */
                        item->user_data_1 = (void *)this;
+                       if (item->is_folder) {
+                       item->user_data_2 = (void *)elm_genlist_item_append(m_main_folder_genlist, &m_folder_genlist_item_class,
+                                                                       item, NULL, ELM_GENLIST_ITEM_NONE,
+                                                                       __bookmark_item_clicked_cb, this);
+                       } else {
                        item->user_data_2 = (void *)elm_genlist_item_append(m_main_folder_genlist, &m_bookmark_genlist_item_class,
                                                                        item, NULL, ELM_GENLIST_ITEM_NONE,
                                                                        __bookmark_item_clicked_cb, this);
+                       }
                        m_main_folder_list.push_back(item);
                }
 
@@ -2120,6 +2133,13 @@ Evas_Object *Browser_Bookmark_View::_create_main_folder_genlist(void)
                m_bookmark_genlist_item_class.func.del = NULL;
 //             m_bookmark_genlist_item_class.func.moved = __genlist_move_cb;
 
+               m_folder_genlist_item_class.item_style = "1text.1icon.2";
+               m_folder_genlist_item_class.decorate_item_style = "mode/slide2";
+               m_folder_genlist_item_class.decorate_all_item_style = "edit_default";
+               m_folder_genlist_item_class.func.text_get = __genlist_label_get_cb;
+               m_folder_genlist_item_class.func.content_get = __genlist_icon_get_cb;
+               m_folder_genlist_item_class.func.state_get = NULL;
+               m_folder_genlist_item_class.func.del = NULL;
                evas_object_show(genlist);
 
                /* Fill bookmark list */
@@ -2134,9 +2154,16 @@ Evas_Object *Browser_Bookmark_View::_create_main_folder_genlist(void)
                BROWSER_LOGD("bookmark count=%d", size);
                for (int i = 0 ; i < size ; i++ ) {
                        m_main_folder_list[i]->user_data_1 = (void *)this;
-                       m_main_folder_list[i]->user_data_2 = (void *)elm_genlist_item_append(genlist,
-                                               &m_bookmark_genlist_item_class, m_main_folder_list[i], NULL,
-                                               ELM_GENLIST_ITEM_NONE, __bookmark_item_clicked_cb, this);
+                       if (m_main_folder_list[i]->is_folder) {
+                               m_main_folder_list[i]->user_data_2 = (void *)elm_genlist_item_append(genlist,
+                                                       &m_folder_genlist_item_class, m_main_folder_list[i], NULL,
+                                                       ELM_GENLIST_ITEM_NONE, __bookmark_item_clicked_cb, this);
+
+                       } else {
+                               m_main_folder_list[i]->user_data_2 = (void *)elm_genlist_item_append(genlist,
+                                                       &m_bookmark_genlist_item_class, m_main_folder_list[i], NULL,
+                                                       ELM_GENLIST_ITEM_NONE, __bookmark_item_clicked_cb, this);
+                       }
                }
        }
 

diff --git a/src/browser-bookmark/browser-new-folder-view.cpp b/src/browser-bookmark/browser-new-folder-view.cpp
index 44ea2bb..51a5e36 100755 (executable)
--- a/src/browser-bookmark/browser-new-folder-view.cpp
+++ b/src/browser-bookmark/browser-new-folder-view.cpp
@@ -139,7 +139,7 @@ Eina_Bool Browser_New_Folder_View::_create_new_folder(const char *folder_name)
                                folder_list[i]->user_data_1 = (void *)bookmark_view;
                                bookmark_view->m_main_folder_list.push_back(folder_list[i]);
                                folder_list[i]->user_data_2 = (void *)elm_genlist_item_append(bookmark_view->m_main_folder_genlist,
-                                               &(bookmark_view->m_bookmark_genlist_item_class), folder_list[i], NULL,
+                                               &(bookmark_view->m_folder_genlist_item_class), folder_list[i], NULL,
                                                ELM_GENLIST_ITEM_NONE, bookmark_view->__bookmark_item_clicked_cb, bookmark_view);
 
                                break;