Remove ROTATE_SYNC

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

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index 47fa6bc..ae99480 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -302,7 +302,6 @@ OnWindowShown(void* pData, int type, void* pEvent)
                        _EcoreEvas* pEcoreEvas = static_cast<_EcoreEvas*>(pData);
                        if (pEcoreEvas)
                        {
-                               SysLog(NID_UI, "ROTATE SYNC: Window(0x%x) <- X(0x%x) IsOrientationEnabled = %d", pWindow, win, orientationEnabled);
                                pEcoreEvas->SetWindowOrientationEnabled(*pWindow, orientationEnabled);
                        }
                }
@@ -1210,17 +1209,6 @@ _EcoreEvas::SetWindowOrientationEnabled(const _Window& window, bool enable)
        }
 
        unsigned int supportRotation = (unsigned int)enable;
-       if (enable)
-       {
-               SysLog(NID_UI, "ROTATE SYNC: atomRotateAuto = %d, supportRotation = %d, Window(0x%x) <- X(0x%x) ON", 
-                       __atomRotateAuto, supportRotation, &window, window.GetNativeHandle());
-       }
-       else
-       {
-               SysLog(NID_UI, "ROTATE SYNC: atomRotateAuto = %d, supportRotation = %d, Window(0x%x) <- X(0x%x) OFF", 
-                       __atomRotateAuto, supportRotation, &window, window.GetNativeHandle());
-       }
-
        ecore_x_window_prop_card32_set(win, __atomRotateAuto, &supportRotation, 1);
 }
 

diff --git a/src/ui/FUi_OrientationAgent.cpp b/src/ui/FUi_OrientationAgent.cpp
index 3843f21..e012783 100644 (file)
--- a/src/ui/FUi_OrientationAgent.cpp
+++ b/src/ui/FUi_OrientationAgent.cpp
@@ -154,7 +154,6 @@ _OrientationAgent::Update(bool draw)
                return;
        }
 
-#if defined(ROTATION_SYNC)
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
        {
@@ -178,13 +177,11 @@ _OrientationAgent::Update(bool draw)
                                {
                                        if ((__mode == ORIENTATION_AUTOMATIC) || (__mode == ORIENTATION_AUTOMATIC_FOUR_DIRECTION))
                                        {
-                                               SysLog(NID_UI, "ROTATE SYNC: Form(0x%x) <- Parent(0x%x), X(0x%x) ON", pForm, pWindow, pWindow->GetNativeHandle());
                                                pEcoreEvas->SetWindowOrientationEnabled(*pWindow, true);
                                                pWindow->SetOrientationEnabled(true);
                                        }
                                        else
                                        {
-                                               SysLog(NID_UI, "ROTATE SYNC: Form(0x%x) <- Parent(0x%x), X(0x%x) OFF", pForm, pWindow, pWindow->GetNativeHandle());
                                                pEcoreEvas->SetWindowOrientationEnabled(*pWindow, false);
                                                pWindow->SetOrientationEnabled(false);
                                        }
@@ -205,13 +202,11 @@ _OrientationAgent::Update(bool draw)
                                {
                                        if ((__mode == ORIENTATION_AUTOMATIC) || (__mode == ORIENTATION_AUTOMATIC_FOUR_DIRECTION))
                                        {
-                                               SysLog(NID_UI, "ROTATE SYNC: Frame(0x%x) <- X(0x%x) ON", pFrame, pFrame->GetNativeHandle());
                                                pEcoreEvas->SetWindowOrientationEnabled(*pFrame, true);
                                                pFrame->SetOrientationEnabled(true);
                                        }
                                        else
                                        {
-                                               SysLog(NID_UI, "ROTATE SYNC: Frame(0x%x) <- X(0x%x) OFF", pFrame, pFrame->GetNativeHandle());
                                                pEcoreEvas->SetWindowOrientationEnabled(*pFrame, false);
                                                pFrame->SetOrientationEnabled(false);
                                        }
@@ -219,7 +214,6 @@ _OrientationAgent::Update(bool draw)
                        }
                }
        }
-#endif
 
        OrientationStatus status = pImplManager->GetOrientationStatus(__mode);
 
@@ -235,14 +229,6 @@ _OrientationAgent::Update(bool draw)
 
        __status = status;
 
-#if !defined(ROTATION_SYNC)
-       _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
-       if (!pEcoreEvas)
-       {
-               return;
-       }
-#endif
-
        pEcoreEvas->AllowSetWindowBounds(false);
        FireEvent(status);
        pEcoreEvas->AllowSetWindowBounds(true);

diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp
index 1b0e0ac..0443548 100644 (file)
--- a/src/ui/FUi_Window.cpp
+++ b/src/ui/FUi_Window.cpp
@@ -253,11 +253,9 @@ _Window::CreateRootVisualElement(void)
        result r = CreateLayer();
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-#if defined(ROTATION_SYNC)
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        SysAssert(pEcoreEvas);
        pEcoreEvas->SetWindowOrientationEnabled(*this, false);
-#endif
 
        // Get visual element.
        _VisualElement* pVisualElement = GetVisualElement();
@@ -331,7 +329,6 @@ _Window::IsActivationEnabled(void)
        return enable;
 }
 
-#if defined(ROTATION_SYNC)
 void
 _Window::SetOrientationEnabled(bool enable)
 {
@@ -343,7 +340,6 @@ _Window::IsOrientationEnabled(void)
 {
        return __orientationEnabled;
 }
-#endif
 
 _RootVisualElement*
 _Window::GetRootVisualElement(void) const
@@ -581,9 +577,7 @@ _Window::_Window()
        , __isOpened(false)
        , __isInitialized(false)
        , __pFocusedControl(null)
-#if defined(ROTATION_SYNC)
        , __orientationEnabled(false)
-#endif
        , __transient(true)
 {
        SetControlDelegate(*this);

diff --git a/src/ui/inc/FUi_Types.h b/src/ui/inc/FUi_Types.h
index a7160cb..671ce4e 100644 (file)
--- a/src/ui/inc/FUi_Types.h
+++ b/src/ui/inc/FUi_Types.h
@@ -24,7 +24,6 @@
 #include <FBase_ObjectManagerT.h>
 
 #define MULTI_WINDOW
-#define ROTATION_SYNC
 
 namespace Tizen { namespace Ui
 {

diff --git a/src/ui/inc/FUi_Window.h b/src/ui/inc/FUi_Window.h
index 6d6e64a..aaf9101 100644 (file)
--- a/src/ui/inc/FUi_Window.h
+++ b/src/ui/inc/FUi_Window.h
@@ -91,10 +91,8 @@ public:
        void SetActivationEnabled(bool enable);
        bool IsActivationEnabled(void);
 
-#if defined(ROTATION_SYNC)
        void SetOrientationEnabled(bool enable);
        bool IsOrientationEnabled(void);
-#endif
 
        Tizen::Ui::Animations::_RootVisualElement* GetRootVisualElement(void) const;
        NativeWindowHandle GetNativeHandle(void) const;
@@ -139,9 +137,7 @@ private:
        bool __isOpened;
        bool __isInitialized;
        _Control* __pFocusedControl;
-#if defined(ROTATION_SYNC)
        bool __orientationEnabled;
-#endif
        bool __transient;
 
        friend class _ControlManager;