Title & Indicator policy has been changed.

[Issue#]
[Problem]
[Cause]
[Solution]
1. Title hasn't been supported anymore.
2. Indicator displays only  when maximized mode.
[SCMRequest] N/A

Change-Id: Ia5abfe68a79842b520d3f23baf12d3500c955d3f

diff --git a/src/wrt-client/window_data.cpp b/src/wrt-client/window_data.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 047cc1f..420ab27
--- a/src/wrt-client/window_data.cpp
+++ b/src/wrt-client/window_data.cpp
@@ -94,140 +94,35 @@ void WindowData::unsetEvasObjectForLayout()
     elm_object_content_unset(m_conformant);
 }
 
-void WindowData::toggleIndicator(bool indicator)
+void WindowData::toggleIndicator(bool fullscreen)
 {
     LogDebug(__PRETTY_FUNCTION__);
-    if (indicator)
-        elm_win_indicator_mode_set(m_win, ELM_WIN_INDICATOR_SHOW);
-    else
+    if (fullscreen) {
         elm_win_indicator_mode_set(m_win, ELM_WIN_INDICATOR_HIDE);
+    }
+    else {
+        elm_win_indicator_mode_set(m_win, ELM_WIN_INDICATOR_SHOW);
+    }
 
 }
 
 void WindowData::setViewMode(
-        const char *title,
         bool fullscreen,
-        bool indicator,
         CtxMenuItems ctxMenuItems)
 {
     LogDebug("setViewMode");
-    LogDebug("fullscreen: " << fullscreen << ", indicator: " << indicator);
+    LogDebug("fullscreen: " << fullscreen );
 
-    m_indicator = indicator;
     m_fullscreen = fullscreen;
 
-    toggleIndicator(indicator);
+    toggleIndicator(m_fullscreen);
 
-    m_title = title;
     m_ctxMenuItems = ctxMenuItems;
 
     if(m_debugMode) {
-        if(fullscreen)
-            showHiddenOption(m_user_layout);
-        else
-            createTitle(m_title.c_str(), m_ctxMenuItems);
-
+        showHiddenOption(m_user_layout);
         createToolbar(m_ctxMenuItems);
     }
-    else
-        if(!fullscreen)
-            createTitle(m_title.c_str(), m_ctxMenuItems);
-}
-
-void WindowData::createTitle(const char *data, CtxMenuItems ctxMenuItems)
-{
-    LogDebug("createTitle");
-    showTitle(data);
-    if(m_debugMode) {
-        createMoreButton();
-        createTitleToolbar(ctxMenuItems);
-    }
-}
-
-void WindowData::showTitle(const char *data)
-{
-    LogInfo("showTitle");
-
-    Elm_Object_Item* naviIt = elm_naviframe_top_item_get(m_navigation);
-    elm_naviframe_item_title_visible_set(naviIt, EINA_TRUE);
-    elm_object_item_text_set(naviIt, data);
-}
-
-void WindowData::hideTitle()
-{
-    LogInfo("hideTitle");
-
-    Elm_Object_Item* naviIt = elm_naviframe_top_item_get(m_navigation);
-    elm_object_item_signal_emit(naviIt, "elm,state,optionheader,instant_close", "");
-    optionheaderClose = FALSE;
-
-    elm_naviframe_item_title_visible_set(naviIt, EINA_FALSE);
-}
-
-void WindowData::createMoreButton()
-{
-    Evas_Object *btn = elm_button_add(m_navigation);
-    if (!btn)
-        return;
-    Elm_Object_Item* naviIt = elm_naviframe_top_item_get(m_navigation);
-    elm_object_style_set(btn, "naviframe/more/default");
-    evas_object_smart_callback_add(btn, "clicked", moreButtonCallback, this);
-    elm_object_item_part_content_set(naviIt, "title_more_btn", btn);
-    evas_object_show(btn);
-
-}
-
-void WindowData::createTitleToolbar(CtxMenuItems ctxMenuItems)
-{
-    Elm_Object_Item *toolbarIt;
-    Evas_Object *toolbarButton;
-    Elm_Object_Item *naviIt = elm_naviframe_top_item_get(m_navigation);
-
-    Evas_Object *toolbar = elm_toolbar_add(m_navigation);
-    if (!toolbar)
-        return;
-    elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
-
-    elm_object_style_set(toolbar, "naviframe");
-
-    toolbarButton = elm_button_add(m_navigation);
-    if (!toolbarButton)
-        return;
-
-    std::list<CtxMenuItem>::iterator itor;
-    for (itor = ctxMenuItems.begin(); itor != ctxMenuItems.end(); ++itor) {
-        toolbarButton = elm_button_add(toolbar);
-        elm_object_style_set(toolbarButton, "naviframe_contrl/default");
-        evas_object_size_hint_align_set(toolbarButton,
-                EVAS_HINT_FILL,
-                EVAS_HINT_FILL);
-        elm_object_text_set(toolbarButton, ((*itor).label).c_str());
-        evas_object_smart_callback_add(toolbarButton,
-                "clicked",
-                (*itor).callback,
-                (*itor).data);
-        toolbarIt = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
-        elm_object_item_part_content_set(toolbarIt, "object", toolbarButton);
-    }
-
-    toolbarButton = elm_button_add(toolbar);
-    elm_object_style_set(toolbarButton, "naviframe_contrl/default");
-    evas_object_size_hint_align_set(toolbarButton,
-            EVAS_HINT_FILL,
-            EVAS_HINT_FILL);
-    elm_object_text_set(toolbarButton, WRT_OPTION_LABEL_FULLVIEW);
-    evas_object_smart_callback_add(toolbarButton,
-            "clicked",
-            changeViewModeCallback,
-            this);
-    toolbarIt = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
-    elm_object_item_part_content_set(toolbarIt, "object", toolbarButton);
-
-    elm_object_item_part_content_set(naviIt, "optionheader", toolbar);
-    elm_object_item_signal_emit(naviIt,
-            "elm,state,optionheader,instant_close",
-            "");
-    optionheaderClose = TRUE;
 }
 
 void WindowData::createToolbar(CtxMenuItems ctxMenuItems)
@@ -287,30 +182,6 @@ void WindowData::createToolbar(CtxMenuItems ctxMenuItems)
         elm_object_item_part_content_set(toolbarIt, "object", toolbarButton);
     }
 
-    toolbarButton = elm_button_add(toolbar);
-    if (!toolbarButton)
-        return;
-
-    Evas_Object *ic = elm_icon_add(toolbar);
-    snprintf(buf, sizeof(buf), WRT_OPTION_ICON_WINDOWVIEW);
-    elm_icon_file_set(ic, buf, NULL);
-    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-    elm_icon_resizable_set(ic, EINA_TRUE, EINA_TRUE);
-    elm_object_part_content_set(toolbarButton, "icon", ic);
-
-    evas_object_size_hint_align_set(toolbarButton,
-            EVAS_HINT_FILL,
-            EVAS_HINT_FILL);
-    evas_object_size_hint_weight_set(toolbarButton,
-            EVAS_HINT_EXPAND,
-            EVAS_HINT_EXPAND);
-    evas_object_smart_callback_add(toolbarButton,
-            "clicked",
-            changeViewModeCallback,
-            this);
-    toolbarIt = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
-    elm_object_item_part_content_set(toolbarIt, "object", toolbarButton);
-
     optionheaderClose = TRUE;
 
     elm_object_part_content_set(m_user_layout,
@@ -333,25 +204,6 @@ void WindowData::hideToolbar()
     }
 }
 
-void WindowData::createTitleButton()
-{
-    // Add left button for back action
-    m_naviBackButton = elm_button_add(m_navigation);
-    elm_object_style_set(m_naviBackButton, "navigationbar_backbutton/default");
-
-    Elm_Object_Item* naviIt = elm_naviframe_top_item_get(m_navigation);
-    elm_object_item_part_content_set(naviIt, "prev_btn", m_naviBackButton);
-}
-
-void WindowData::updateTitleButton(const bool display)
-{
-    if (display) {
-        evas_object_show(m_naviBackButton);
-    } else {
-        evas_object_hide(m_naviBackButton);
-    }
-}
-
 Evas_Object* WindowData::createWindow(unsigned long pid)
 {
     Evas_Object* window = elm_win_add(NULL, "wrt-widget", ELM_WIN_BASIC);
@@ -365,6 +217,7 @@ Evas_Object* WindowData::createWindow(unsigned long pid)
     int w, h;
     ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
     evas_object_resize(window, w, h);
+
     return window;
 }
 
@@ -544,11 +397,9 @@ void WindowData::changeViewModeCallback(void *data,
     Elm_Object_Item *naviIt = elm_naviframe_top_item_get(This->m_navigation);
 
     if(elm_naviframe_item_title_visible_get(naviIt)) {
-        This->hideTitle();
         This->showHiddenOption(This->m_user_layout);
 
     } else {
-        This->createTitle(This->m_title.c_str(), This->m_ctxMenuItems);
         This ->hideToolbar();
     }
 }
@@ -562,7 +413,6 @@ void WindowData::controlHiddenOptionCallback(void *data,
     WindowData* This = static_cast<WindowData *>(data);
     Elm_Object_Item *naviIt = elm_naviframe_top_item_get(This->m_navigation);
 
-    if(!elm_naviframe_item_title_visible_get(naviIt)) {
         const char* state = edje_object_part_state_get(
                 elm_layout_edje_get(This->m_user_layout),
                 "elm.swallow.toolbar",
@@ -575,8 +425,6 @@ void WindowData::controlHiddenOptionCallback(void *data,
         else {
             This->initFullViewMode();
         }
-
-    }
 }
 
 Eina_Bool WindowData::hideToolbarCallback(void *data)
@@ -600,9 +448,6 @@ void WindowData::toggleFullscreen(bool fullscreen)
         return;
     }
 
-    if (!m_fullscreen) //If ViewMode is not fullscreen, toggle the title bar.
-        fullscreen ? hideTitle() : showTitle(m_title.c_str());
-
     if (m_indicator) //If indicator is shown by default, toggle it.
         toggleIndicator(!fullscreen);
 

diff --git a/src/wrt-client/window_data.h b/src/wrt-client/window_data.h
old mode 100644 (file)
new mode 100755 (executable)
index 4b49570..cf177e8
--- a/src/wrt-client/window_data.h
+++ b/src/wrt-client/window_data.h
@@ -44,12 +44,10 @@ namespace {
 const char *const WRT_OPTION_LABEL_BACKWARD = "Backward";
 const char *const WRT_OPTION_LABEL_FORWARD = "Forward";
 const char *const WRT_OPTION_LABEL_RELOAD = "Reload";
-const char *const WRT_OPTION_LABEL_FULLVIEW = "Full view";
 
 const char *const WRT_OPTION_ICON_BACKWARD = "/usr/etc/wrt/icon_left_arrow.png";
 const char *const WRT_OPTION_ICON_FORWARD = "/usr/etc/wrt/icon_right_arrow.png";
 const char *const WRT_OPTION_ICON_RELOAD  = "/usr/etc/wrt/icon_refresh.png";
-const char *const WRT_OPTION_ICON_WINDOWVIEW = "/usr/etc/wrt/mp_stop.png";
 }
 
 class WindowData : private DPL::Noncopyable
@@ -113,16 +111,13 @@ class WindowData : private DPL::Noncopyable
             const char* source);
 
     void changeViewMode();
-    void createTitleToolbar(CtxMenuItems ctxMenuItems);
     void createToolbar(CtxMenuItems ctxMenuItems);
     void showToolbar();
     void hideToolbar();
     void createOptionButton();
     void destroyOptionButton();
     void setViewMode(
-            const char *title,
             bool fullscreen,
-            bool indicator,
             CtxMenuItems ctxMenuItems);
     void initFullViewMode();
 
@@ -161,13 +156,7 @@ class WindowData : private DPL::Noncopyable
     void hideHiddenOption(Evas_Object* parent);
 
     void alignProgressPosition();
-    void createTitle(const char* data, CtxMenuItems ctxMenuItems);
-    void showTitle(const char* data);
-    void hideTitle();
-    void createMoreButton();
-    void createTitleButton();
-    void updateTitleButton(const bool display);
-    void toggleIndicator(bool indicator);
+    void toggleIndicator(bool fullscreen);
 };
 
 #endif /* WINDOW_INITIALIZE_H_ */

diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 4418961..48e93f1
--- a/src/wrt-client/wrt-client.cpp
+++ b/src/wrt-client/wrt-client.cpp
@@ -575,9 +575,7 @@ void WrtClient::initializeWindowModes()
     ctxMenuForward.data = this;
     ctxMenuItems.push_back(ctxMenuForward);
 
-    m_windowData->setViewMode(name.c_str(),
-                              fullscreen,
-                              indicator,
+    m_windowData->setViewMode(fullscreen,
                               ctxMenuItems);
 }