From 6b9af567fd14941172b26fa6317622173e2cde90 Mon Sep 17 00:00:00 2001 From: "m.kawonczyk" Date: Tue, 20 Oct 2015 14:57:09 +0200 Subject: [PATCH] Close Tabs button in Tab Manager [Issue] https://bugs.tizen.org/jira/browse/TT-219 [Problem] "Close Tabs" button in Tab Manager does not return to "Close Tabs" from "Close all" [Solution] Found that signals created in TabUI arent called, while signals from SimpleUI are. Copied code that is responsible for text change to right location. [Verification] Open tabs manager. Click "Close Tabs" button. Either close a tab, click "Close All" or exit from Tab Manager. Reopen Tab Manager. Change-Id: Iba4ab9aa916cf39a6d3e919a7215c5c265e597aa --- services/TabUI/TabUI.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/TabUI/TabUI.cpp b/services/TabUI/TabUI.cpp index 401c6d8..c258959 100644 --- a/services/TabUI/TabUI.cpp +++ b/services/TabUI/TabUI.cpp @@ -246,6 +246,7 @@ void TabUI::_newtab_clicked(void * data, Evas_Object*, void*) } } + void TabUI::_openedtabs_clicked(void* data, Evas_Object*, void*) { BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__); @@ -295,6 +296,7 @@ void TabUI::_closetabs_clicked(void* data, Evas_Object*, void*) BROWSER_LOGD("[%s:%d] --------> edit mode: %d ", __PRETTY_FUNCTION__, __LINE__, tabUI->editMode); elm_layout_text_set(elm_layout_content_get(tabUI->m_tab_layout, "action_bar"), "closetabs_text", "Close all"); } else if (tabUI->editMode && !tabUI->onOtherDevicesSwitch) { + tabUI->editMode = false; tabUI->closeAllTabs(); elm_gengrid_realized_items_update(tabUI->m_gengrid); } @@ -319,6 +321,8 @@ void TabUI::addTabItem(std::shared_ptr>items) { BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__); + elm_layout_text_set(elm_layout_content_get(m_tab_layout, "action_bar"), "closetabs_text", "Close Tabs"); + editMode = false; for (auto it = items.begin(); it < items.end(); it++) { addTabItem(*it); } -- 2.7.4