Revert "[Tizen] Adds to get window rotation's angle and screen rotation."

This reverts commit 785e3ba53c7a0e7a054bd194fa92a9c603dbc49f.

diff --git a/dali/internal/drag-and-drop/tizen-wayland/drag-and-drop-impl-ecore-wl2.cpp b/dali/internal/drag-and-drop/tizen-wayland/drag-and-drop-impl-ecore-wl2.cpp
index e30131622dd46f1e75e623a66656c2860de75515..d033e1c40756780805afe58c35aa33f48d2eb2b6 100644 (file)
--- a/dali/internal/drag-and-drop/tizen-wayland/drag-and-drop-impl-ecore-wl2.cpp
+++ b/dali/internal/drag-and-drop/tizen-wayland/drag-and-drop-impl-ecore-wl2.cpp
@@ -492,8 +492,7 @@ Vector2 DragAndDropEcoreWl::RecalculatePositionByOrientation(int x, int y, Dali:
 {
   int screenWidth, screenHeight;
   Internal::Adaptor::WindowSystem::GetScreenSize(screenWidth, screenHeight);
-  Internal::Adaptor::Window& windowImpl = Dali::GetImplementation(window);
-  int angle = windowImpl.GetCurrentWindowRotationAngle();
+  int angle = static_cast<int>(DevelWindow::GetCurrentOrientation(window));
   Dali::Window::WindowSize size = window.GetSize();
 
   int           newX, newY;

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 0a81983ebd095b4739efb78573907d1ddd6bb9fb..302125a5e6a9e1499562cd570e39c6c16a8c1bae 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -1673,16 +1673,6 @@ WindowBlurInfo Window::GetBlur() const
   return mBlurInfo;
 }
 
-int Window::GetCurrentWindowRotationAngle() const
-{
-  return mRotationAngle;
-}
-
-int Window::GetCurrentScreenRotationAngle() const
-{
-  return mWindowBase->GetScreenRotationAngle();
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index 944fbbbdadb391f8608dfbc0721044bc6f770e80..3c31b00ab00f07a9472db3adb6a352c15c4ff185 100644 (file)
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -637,27 +637,6 @@ public: // Dali::Internal::Adaptor::SceneHolder
    */
   WindowBlurInfo GetBlur() const;
 
-public: // It is only for window-impl. Need not public for the others.
-  /**
-   * @brief Gets current window rotation angle.
-   *
-   * Gets current window rotation's angle is related to window rotation
-   * It is just supported in window-impl
-   *
-   * @return A current window rotation's angle.
-   */
-  int GetCurrentWindowRotationAngle() const;
-
-  /**
-   * @brief Gets current screen rotation's angle.
-   *
-   * Gets current screen rotation's angle is related to screen rotation
-   * It is just supported in window-impl
-   *
-   * @return A current screen rotation's angle.
-   */
-  int GetCurrentScreenRotationAngle() const;
-
 private:
   /**
    * @brief Enumeration for orietation mode.