[Title] make the selected folder is selected again after get into the select folder...

[Issue#] N_SE-8043
[Problem] selected folder is not set after get into the select folder view more then secont times.
[Cause] wrong index has been set when the launch the select folder view.
[Solution] proper index is set.
[Team] Browser UI
[Developer] sangpyo7.kim
[Request] N/A

Change-Id: I4bbb9361f3a2019c7e94486d5ec6cfc25cb63acf

diff --git a/src/browser-bookmark/browser-add-to-bookmark-view.cpp b/src/browser-bookmark/browser-add-to-bookmark-view.cpp
index 4ad63cf..5d90fd3 100755 (executable)
--- a/src/browser-bookmark/browser-add-to-bookmark-view.cpp
+++ b/src/browser-bookmark/browser-add-to-bookmark-view.cpp
@@ -283,7 +283,7 @@ void Browser_Add_To_Bookmark_View::_select_folder_clicked_cb(void *data, Evas_Ob
                return;
 
        Browser_Add_To_Bookmark_View *add_to_bookmark_view = (Browser_Add_To_Bookmark_View *)data;
-       if (!m_data_manager->create_select_folder_view(add_to_bookmark_view->m_current_folder_id)) {
+       if (!m_data_manager->create_select_folder_view(add_to_bookmark_view->m_folder_id_to_save)) {
                BROWSER_LOGE("m_data_manager->create_select_folder_view failed");
                return;
        }

diff --git a/src/browser-bookmark/browser-select-folder-view.cpp b/src/browser-bookmark/browser-select-folder-view.cpp
index 7758b96..00cbf0b 100755 (executable)
--- a/src/browser-bookmark/browser-select-folder-view.cpp
+++ b/src/browser-bookmark/browser-select-folder-view.cpp
@@ -83,6 +83,10 @@ void Browser_Select_Folder_View::__folder_item_selected_cb(void *data, Evas_Obje
 
        elm_list_item_selected_set(it, EINA_FALSE);
 
+       if (elm_naviframe_bottom_item_get(select_folder_view->m_navi_bar)
+           != elm_naviframe_top_item_get(select_folder_view->m_navi_bar))
+               elm_naviframe_item_pop(select_folder_view->m_navi_bar);
+
        if (m_data_manager->get_edit_bookmark_view())
                m_data_manager->get_edit_bookmark_view()->return_to_add_to_bookmark_view(select_folder_view->m_current_folder_id);
        else if (m_data_manager->get_add_to_bookmark_view())