Remove the redundancy for geometry calculate function

The geometry calculate is needed from client to displayer server module.
The calcuate function is needed when window is resized, moved and set the input region.
For that, the calculated function is existed twice.
This patch is to remove one of them.

Change-Id: I87ff260b0e31475735c80c3e144bd1a68e3ad907

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
index 812ecfe..ad40012 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -2249,44 +2249,9 @@ unsigned int WindowBaseEcoreWl2::GetAuxiliaryHintId(const std::string& hint) con
   return 0;
 }
 
-Rect<int> WindowBaseEcoreWl2::RecalculateInputRect(const Rect<int>& rect)
-{
-  Rect<int> newRect;
-
-  if(mWindowRotationAngle == 90)
-  {
-    newRect.x      = rect.y;
-    newRect.y      = mWindowPositionSize.height - (rect.x + rect.width);
-    newRect.width  = rect.height;
-    newRect.height = rect.width;
-  }
-  else if(mWindowRotationAngle == 180)
-  {
-    newRect.x      = mWindowPositionSize.width - (rect.x + rect.width);
-    newRect.y      = mWindowPositionSize.height - (rect.y + rect.height);
-    newRect.width  = rect.width;
-    newRect.height = rect.height;
-  }
-  else if(mWindowRotationAngle == 270)
-  {
-    newRect.x      = mWindowPositionSize.width - (rect.y + rect.height);
-    newRect.y      = rect.x;
-    newRect.width  = rect.height;
-    newRect.height = rect.width;
-  }
-  else
-  {
-    newRect.x      = rect.x;
-    newRect.y      = rect.y;
-    newRect.width  = rect.width;
-    newRect.height = rect.height;
-  }
-  return newRect;
-}
-
 void WindowBaseEcoreWl2::SetInputRegion(const Rect<int>& inputRegion)
 {
-  Rect<int> convertRegion = RecalculateInputRect(inputRegion);
+  Rect<int> convertRegion = RecalculatePositionSizeToSystem(inputRegion);
 
   Eina_Rectangle rect;
   rect.x = convertRegion.x;
@@ -3140,7 +3105,7 @@ bool WindowBaseEcoreWl2::IsFloatingModeEnabled() const
 
 void WindowBaseEcoreWl2::IncludeInputRegion(const Rect<int>& inputRegion)
 {
-  Rect<int>      convertRegion = RecalculateInputRect(inputRegion);
+  Rect<int>      convertRegion = RecalculatePositionSizeToSystem(inputRegion);
   Eina_Rectangle rect;
 
   rect.x = convertRegion.x;
@@ -3157,7 +3122,7 @@ void WindowBaseEcoreWl2::IncludeInputRegion(const Rect<int>& inputRegion)
 
 void WindowBaseEcoreWl2::ExcludeInputRegion(const Rect<int>& inputRegion)
 {
-  Rect<int>      convertRegion = RecalculateInputRect(inputRegion);
+  Rect<int>      convertRegion = RecalculatePositionSizeToSystem(inputRegion);
   Eina_Rectangle rect;
 
   rect.x = convertRegion.x;

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
index af8054f..b70afbc 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
@@ -600,20 +600,6 @@ private:
    */
   PositionSize RecalculatePositionSizeToCurrentOrientation(PositionSize positionSize);
 
-  /**
-   * @brief Return the rect value to recalulate with the default system coordinates.
-   *
-   * Some native window APIs work the geometry value based on the default system coordinates.
-   * IncludeInputRegion() and ExcludeInputRegion() are one of them.
-   * When the window is rotated, current window's geometry already were set with the rotated angle.
-   * If IncludeInputRegion() or ExcludeInputRegion() are called with rotated angle by application,
-   * the rect's area should be re-calcuated on the default system coordinates.
-   *
-   * @param[in] rect the window's current position and size with current window rotation angle.
-   * @return the re-calculated rect on the default system coordinates.
-   */
-  Rect<int> RecalculateInputRect(const Rect<int>& rect);
-
 protected:
   // Undefined
   WindowBaseEcoreWl2(const WindowBaseEcoreWl2&) = delete;