Fix for fullscreen toggling methods

[Issue#] ORANGE-128
[Bug] Fullscreen API broken
[Cause] Changes made to fullscreen toggling methods broke them
[Solution] Fix the changes
[Verification] Run the fullscreen-test.wgt widget

The verification widget is available in the bug report:
https://tizendev.org/bugs/browse/ORANGE-128

Change-Id: Icce5df94ebfbf91d51aa3c7119d4bbe2d303fe63

diff --git a/src/wrt-client/window_data.cpp b/src/wrt-client/window_data.cpp
index 60c027a..7a75649 100755 (executable)
--- a/src/wrt-client/window_data.cpp
+++ b/src/wrt-client/window_data.cpp
@@ -96,7 +96,8 @@ void WindowData::unsetEvasObjectForLayout()
 
 void WindowData::toggleIndicator(bool fullscreen)
 {
-    LogDebug(__PRETTY_FUNCTION__);
+    LogDebug("fullscreen=" << (fullscreen?"true":"false"));
+
     if (!fullscreen) {
         elm_win_indicator_mode_set(m_win, ELM_WIN_INDICATOR_SHOW);
         elm_layout_theme_set(m_platform_layout,
@@ -627,11 +628,10 @@ void WindowData::toggleFullscreen(bool fullscreen)
         return;
     }
 
-    if (!m_fullscreen) //If ViewMode is not fullscreen, toggle the title bar.
+    if (!m_fullscreen) {
+        //If ViewMode is not fullscreen, toggle the title bar and indicator
         fullscreen ? hideTitle() : showTitle(m_title.c_str());
-
-    if (m_indicator) //If indicator is shown by default, toggle it.
-        toggleIndicator(!fullscreen);
-
+        toggleIndicator(fullscreen);
+    }
     alreadyFullscreen = !alreadyFullscreen;
 }

diff --git a/src/wrt-client/window_data.h b/src/wrt-client/window_data.h
index ce81672..1c078ae 100755 (executable)
--- a/src/wrt-client/window_data.h
+++ b/src/wrt-client/window_data.h
@@ -154,7 +154,6 @@ class WindowData : private DPL::Noncopyable
     std::string m_title;
     CtxMenuItems m_ctxMenuItems;
     Ecore_Timer *m_toolbarTimer;
-    bool m_indicator;
     bool m_fullscreen;
 
     Evas_Object* createWindow(unsigned long pid);