Fix the Rotation

Change-Id: I44ac0b6de5311d4feab106d7f8bbe88d873408b5
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index 4cfc4de..b27efae 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -1219,8 +1219,11 @@ _EcoreEvas::~_EcoreEvas(void)
 }
 
 void
-_EcoreEvas::RotateWindow(const _Window& window, int orientation)
+_EcoreEvas::RotateWindow(const _Window& window, int orientation, bool rotateEvas)
 {
+       // Set window bounds according to the rotation
+       // Rotate Evas
+
        _EflLayer* pLayer = GetEflLayer(window);
        if (!pLayer)
        {
@@ -1264,7 +1267,10 @@ _EcoreEvas::RotateWindow(const _Window& window, int orientation)
 
        if (rotatePartial == false)
        {
-               ecore_evas_rotation_with_resize_set(pEcoreEvas, orientation);
+               if (rotateEvas == true)
+               {
+                       ecore_evas_rotation_with_resize_set(pEcoreEvas, orientation);
+               }
 
                evas_object_move(pWinObj, 0, 0);
 
@@ -1281,7 +1287,10 @@ _EcoreEvas::RotateWindow(const _Window& window, int orientation)
        }
        else
        {
-               ecore_evas_rotation_set(pEcoreEvas, orientation);
+               if (rotateEvas == true)
+               {
+                       ecore_evas_rotation_set(pEcoreEvas, orientation);
+               }
 
                Rectangle winBounds = _CoordinateSystemUtils::Transform(window.GetBounds());
                int rotate = ecore_evas_rotation_get(pEcoreEvas);
@@ -2269,7 +2278,6 @@ _EcoreEvas::SetWindowBounds(const _Window& window, const Rectangle& bounds)
                }
        }
 
-
        int winX = winBounds.x;
        int winY = winBounds.y;
 
@@ -2362,7 +2370,6 @@ _EcoreEvas::SetWindowBounds(const _Window& window, const FloatRectangle& bounds)
                }
        }
 
-
        int winX = winBounds.x;
        int winY = winBounds.y;
 

diff --git a/src/ui/FUi_OrientationAgent.cpp b/src/ui/FUi_OrientationAgent.cpp
index d64dd0b..c441d4e 100644 (file)
--- a/src/ui/FUi_OrientationAgent.cpp
+++ b/src/ui/FUi_OrientationAgent.cpp
@@ -446,7 +446,7 @@ _OrientationAgent::UpdateOrientation(void)
                }
        }
 
-       pEcoreEvas->RotateWindow(*pRootWindow, rotation);
+       pEcoreEvas->RotateWindow(*pRootWindow, rotation, false);
 
        if (__statusChanged == true)
        {

diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp
index 26a0496..ad8dd5e 100644 (file)
--- a/src/ui/FUi_Window.cpp
+++ b/src/ui/FUi_Window.cpp
@@ -622,7 +622,7 @@ _Window::OnWindowStateChanged(void)
        _ControlOrientation controlOrientation = (rotation == 0 || rotation == 180) ? _CONTROL_ORIENTATION_PORTRAIT : _CONTROL_ORIENTATION_LANDSCAPE;
        ChangeLayout(controlOrientation);
 
-       pEcoreEvas->RotateWindow(*this, __rotation);
+       pEcoreEvas->RotateWindow(*this, __rotation, false);
 
        Invalidate(true);
 

diff --git a/src/ui/inc/FUi_EcoreEvas.h b/src/ui/inc/FUi_EcoreEvas.h
index 9fcc6dc..bdbe44e 100644 (file)
--- a/src/ui/inc/FUi_EcoreEvas.h
+++ b/src/ui/inc/FUi_EcoreEvas.h
@@ -108,7 +108,7 @@ public:
        void ActivateWindow(const _Window& window);
        void MinimizeWindow(_Window& window);
 
-       void RotateWindow(const _Window& window, int orientation);
+       void RotateWindow(const _Window& window, int orientation, bool rotateEvas = true);
        int GetWindowRotation(const _Window& window);
 #if defined(WINDOW_BASE_ROTATE)
        void SetWindowPreferredRotation(const _Window& window, int rotation);