Revert "Adjust the position of the partial Frame"

This reverts commit f74c2032de5c0603e9a1a912fa3eb0b322a261a0

diff --git a/src/ui/FUi_OrientationAgent.cpp b/src/ui/FUi_OrientationAgent.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8f9cf5e..9a245e1
--- a/src/ui/FUi_OrientationAgent.cpp
+++ b/src/ui/FUi_OrientationAgent.cpp
@@ -155,8 +155,6 @@ _OrientationAgent::Update(bool draw)
        // Request rotation to window manager -> async -> Update VEs
        // Window(not rotation) -> sync -> UpdateVEs
 
-       SysLog(NID_UI, "[Window Manager Rotation] <<<<<<<<<< Update : START >>>>>>>>>>");
-
        _ControlImplManager* pImplManager = _ControlImplManager::GetInstance();
        SysAssert(pImplManager);
 
@@ -245,8 +243,6 @@ _OrientationAgent::Update(bool draw)
 
                __draw = draw;
 //     }
-
-       SysLog(NID_UI, "[Window Manager Rotation] <<<<<<<<<< Update : END >>>>>>>>>>");
 #else          
        _ControlImplManager* pImplManager = _ControlImplManager::GetInstance();
        SysAssert(pImplManager);
@@ -367,8 +363,6 @@ _OrientationAgent::UpdateOrientation(void)
        // Update window bounds
        // Invalidate
 
-       SysLog(NID_UI, "[Window Manager Rotation] <<<<<<<<<< UpdateOrientation : START >>>>>>>>>>");
-
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
        {
@@ -444,8 +438,6 @@ _OrientationAgent::UpdateOrientation(void)
 
        Rectangle bounds = pRootWindow->GetBounds();
        SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, rot = %d, %d, %d, %d, %d] Update Orientation.", pRootWindow->GetNativeHandle(), rotation, bounds.x, bounds.y, bounds.width, bounds.height);
-
-       SysLog(NID_UI, "[Window Manager Rotation] <<<<<<<<<< UpdateOrientation : END >>>>>>>>>>");
 }
 #endif
 

diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp
index 2515a83..3512884 100644 (file)
--- a/src/ui/controls/FUiCtrl_FormImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FormImpl.cpp
@@ -44,7 +44,6 @@
 #include "FUiCtrl_FooterImpl.h"
 #include "FUiCtrl_Form.h"
 #include "FUiCtrl_Frame.h"
-#include "FUiCtrl_FrameImpl.h"
 #include "FUiCtrl_TabImpl.h"
 #include "FUiCtrl_Indicator.h"
 
@@ -1036,37 +1035,6 @@ _FormImpl::OnChangeLayout(_ControlOrientation orientation)
        const FloatDimension portraitSize = _ControlManager::GetInstance()->_ControlManager::GetScreenSizeF();
        const FloatDimension landscapeSize = FloatDimension(portraitSize.height, portraitSize.width);
 
-       // Adjust the position of the partial Frame.
-       _FrameImpl* pFrameImpl = dynamic_cast<_FrameImpl*>(GetParent());
-       if (pFrameImpl)
-       {
-               FrameShowMode frameShowMode = pFrameImpl->GetShowMode();
-
-               if ((frameShowMode == FRAME_SHOW_MODE_PARTIAL_SCREEN) || (frameShowMode == FRAME_SHOW_MODE_PARTIAL_SCREEN_FLOATING))
-               {
-                       bool movable = pFrameImpl->GetCore().IsMovable();
-                       pFrameImpl->GetCore().SetMovable(true);
-               
-                       FloatPoint prevPoint = pFrameImpl->GetPositionF();
-                       FloatPoint curPoint(0.0f, 0.0f);
-               
-                       if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
-                       {
-                               curPoint.x = portraitSize.width / portraitSize.height * prevPoint.x;
-                               curPoint.y = portraitSize.height / portraitSize.width * prevPoint.y;
-                       }
-                       else
-                       {
-                               curPoint.x = portraitSize.height / portraitSize.width * prevPoint.x;
-                               curPoint.y = portraitSize.width / portraitSize.height * prevPoint.y;
-                       }
-               
-                       pFrameImpl->SetPosition(curPoint);
-               
-                       pFrameImpl->GetCore().SetMovable(movable);
-               }
-       }
-
        // Change layout.
        _ContainerImpl::OnChangeLayout(orientation);
        SysTryReturnVoidResult(NID_UI_CTRL, GetLastResult() == E_SUCCESS, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));

diff --git a/src/ui/controls/FUiCtrl_FrameImpl.cpp b/src/ui/controls/FUiCtrl_FrameImpl.cpp
index efc339f..3eb40f5 100644 (file)
--- a/src/ui/controls/FUiCtrl_FrameImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FrameImpl.cpp
@@ -302,9 +302,7 @@ _FrameImpl::OnChangeLayout(_ControlOrientation orientation)
        SysAssert(pCoreManager);
        const FloatDimension& screenSize = pCoreManager->GetScreenSizeF();
 
-       FrameShowMode frameShowMode = GetCore().GetShowMode();
-
-       if (frameShowMode == FRAME_SHOW_MODE_FULL_SCREEN)
+       if (GetCore().GetShowMode() == FRAME_SHOW_MODE_FULL_SCREEN)
        {
                if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
                {
@@ -315,30 +313,6 @@ _FrameImpl::OnChangeLayout(_ControlOrientation orientation)
                        SetSize(FloatDimension(screenSize.height, screenSize.width));
                }
        }
-       else if ((frameShowMode == FRAME_SHOW_MODE_PARTIAL_SCREEN) || (frameShowMode == FRAME_SHOW_MODE_PARTIAL_SCREEN_FLOATING))
-       {
-               // Adjust the position of the partial Frame.
-               bool movable = IsMovable();
-               SetMovable(true);
-
-               FloatPoint prevPoint = GetPositionF();
-               FloatPoint curPoint(0.0f, 0.0f);
-
-               if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
-               {
-                       curPoint.x = screenSize.width / screenSize.height * prevPoint.x;
-                       curPoint.y = screenSize.height / screenSize.width * prevPoint.y;
-               }
-               else
-               {
-                       curPoint.x = screenSize.height / screenSize.width * prevPoint.x;
-                       curPoint.y = screenSize.width / screenSize.height * prevPoint.y;
-               }
-
-               SetPosition(curPoint);
-
-               SetMovable(movable);
-       }
 
        SetResizable(resizable);
 }