Cannot cancel edit mode in Tab Manager

[Issue]    https://bugs.tizen.org/jira/browse/TT-215
[Problem]  Cannot cancel edit mode in Tab Manager.
[Cause]    N/A
[Solution] Added onBackKey function that is called when "Back" key.:
           is pressed. This function switches off edit Mode.
[Verify]   Add few tabs > Click 'Close Tabs' > Press 'Back' key > Obs

Change-Id: I83b093616e00772ba7c51c9385ccefd2cc908be6

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index fc73d3a..36d9230 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -629,6 +629,8 @@ void SimpleUI::onBackPressed()
     BROWSER_LOGD("[%s]", __func__);
     if (m_zoomUI->isVisible()) {
         m_zoomUI->escapeZoom();
+    } else if ((m_viewManager->topOfStack() == m_tabUI.get()) && m_tabUI->isEditMode()) {
+        m_tabUI->onBackKey();
     } else if (m_webPageUI->isHomePageActive()) {
         m_quickAccess->backButtonClicked();
     } else if ((m_viewManager->topOfStack() == m_webPageUI.get()) && !m_webPageUI->getURIEntry().hasFocus() && !m_wvIMEStatus) {

diff --git a/services/TabUI/TabUI.cpp b/services/TabUI/TabUI.cpp
index c258959..de525a4 100644 (file)
--- a/services/TabUI/TabUI.cpp
+++ b/services/TabUI/TabUI.cpp
@@ -210,6 +210,13 @@ void TabUI::_close_clicked(void* data, Evas_Object*, void*)
     }
 }
 
+void TabUI::onBackKey()
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    editMode = false;
+    elm_layout_text_set(elm_layout_content_get(m_tab_layout, "action_bar"), "closetabs_text", "Close Tabs");
+}
+
 Evas_Object* TabUI::createTopButtons(Evas_Object* parent)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
@@ -433,5 +440,10 @@ void TabUI::_focus_in(void* data, Evas*, Evas_Object*, void* event_info)
         elm_object_item_signal_emit(it, "selected", "over3");
 }
 
+bool TabUI::isEditMode()
+{
+    return editMode;
+}
+
 }
 }

diff --git a/services/TabUI/TabUI.h b/services/TabUI/TabUI.h
index 7ee21a6..6ff6c71 100644 (file)
--- a/services/TabUI/TabUI.h
+++ b/services/TabUI/TabUI.h
@@ -45,6 +45,8 @@ public:
     virtual std::string getName();
 
     void addTabItems(std::vector<std::shared_ptr<tizen_browser::basic_webengine::TabContent> > items);
+    bool isEditMode();
+    void onBackKey();
 
     boost::signals2::signal<void (const tizen_browser::basic_webengine::TabId&)> tabClicked;
     boost::signals2::signal<void ()> newTabClicked;