Fixed Mini App

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

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index 1f51c0a..9864846 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -1979,6 +1979,8 @@ _EcoreEvas::RotateWindow(const _Window& window, int orientation, bool rotateEvas
                {
                        ecore_evas_rotation_with_resize_set(pEcoreEvas, orientation);
 
+                       pLayer->SetOrientationChanged(orientation);
+
                        if ((orientation == 0) || (orientation == 180))
                        {
                                if (pWindow->IsOrientationRoot())
@@ -2010,6 +2012,8 @@ _EcoreEvas::RotateWindow(const _Window& window, int orientation, bool rotateEvas
                if (rotateEvas == true)
                {
                        ecore_evas_rotation_set(pEcoreEvas, orientation);
+
+                       pLayer->SetOrientationChanged(orientation);
                }
 
                Rectangle winBounds = _CoordinateSystemUtils::Transform(window.GetBounds());

diff --git a/src/ui/controls/FUiCtrl_Frame.cpp b/src/ui/controls/FUiCtrl_Frame.cpp
index 9141e7d..17bc308 100644 (file)
--- a/src/ui/controls/FUiCtrl_Frame.cpp
+++ b/src/ui/controls/FUiCtrl_Frame.cpp
@@ -69,6 +69,7 @@ _Frame::_Frame(void)
        , __constructed(false)
        , __rotation(false)
        , __changingBoundsEnabled(true)
+       , __skipSetBounds(false)
        , __pFormActivationChangeEventListener(null)
 {
        _FramePresenter* pPresenter = new (std::nothrow) _FramePresenter(*this);
@@ -614,13 +615,16 @@ _Frame::SetShowMode(FrameShowMode showMode)
 
                        __restore = true;
 
-                       if (GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT)
+                       if (__skipSetBounds == false)
                        {
-                               SetBounds(FloatRectangle(0.0f, 0.0f, screen.width, screen.height));
-                       }
-                       else
-                       {
-                               SetBounds(FloatRectangle(0.0f, 0.0f, screen.height, screen.width));
+                               if (GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT)
+                               {
+                                       SetBounds(FloatRectangle(0.0f, 0.0f, screen.width, screen.height));
+                               }
+                               else
+                               {
+                                       SetBounds(FloatRectangle(0.0f, 0.0f, screen.height, screen.width));
+                               }
                        }
 
                        __restore = false;
@@ -831,7 +835,9 @@ _Frame::OnBackgroundColorChanged(Color& backgroundColor)
 
        // Restore
        FrameShowMode showMode = GetShowMode(false);
+       __skipSetBounds = true;
        SetShowMode(FRAME_SHOW_MODE_FULL_SCREEN);
+       __skipSetBounds = false;
 
        SetShowMode(showMode);
 

diff --git a/src/ui/inc/FUiCtrl_Frame.h b/src/ui/inc/FUiCtrl_Frame.h
index 8e634df..1be9362 100644 (file)
--- a/src/ui/inc/FUiCtrl_Frame.h
+++ b/src/ui/inc/FUiCtrl_Frame.h
@@ -125,6 +125,7 @@ private:
        bool __constructed;
        bool __rotation;
        bool __changingBoundsEnabled;
+       bool __skipSetBounds;
        _IFormActivationChangeEventListener* __pFormActivationChangeEventListener;
 }; // _Frame