[Tizen] Modify window position data type

This reverts commit 6f9ba55ae931df805b3dee8df991008cd87d1bf1.

Change-Id: Ib1401885629fbc60d6da333d648f037cfb3fe2b2

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h
index 9044964..58d344e 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window-impl.h
@@ -30,7 +30,6 @@ namespace Dali
 {
 
 using PositionSize   = Dali::Rect<int>;
-using WindowPosition = Uint16Pair;
 
 namespace Internal
 {
@@ -45,9 +44,9 @@ public:
   virtual ~Window() = default;
   static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent);
 
-  WindowPosition           GetPosition() const;
-  PositionSize             GetPositionSize() const;
-  Dali::Window::WindowSize GetSize() const;
+  Dali::Window::WindowPosition           GetPosition() const;
+  PositionSize                           GetPositionSize() const;
+  Dali::Window::WindowSize               GetSize() const;
 
   void SetPositionSize(PositionSize positionSize);
 

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
index 9fc2763..2746ad9 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
@@ -58,11 +58,11 @@ Window* Window::New(const PositionSize& positionSize, const std::string& name, c
   return new Window( positionSize );
 }
 
-WindowPosition Window::GetPosition() const
+Dali::Window::WindowPosition  Window::GetPosition() const
 {
   PositionSize positionSize = mRenderSurface.GetPositionSize();
 
-  return WindowPosition(positionSize.x, positionSize.y);
+  return Dali::Window::WindowPosition(positionSize.x, positionSize.y);
 }
 
 PositionSize Window::GetPositionSize() const

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
index 0d4e219..5cc10d7 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
@@ -52,7 +52,37 @@ typedef Signal< void (Window,Uint16Pair) > ResizeSignalType;
 class Window : public BaseHandle
 {
 public:
+    class IntPair
+    {
+    public:
+      IntPair()
+      : mX(0),
+        mY(0)
+      {
+      };
+
+      IntPair(int x, int y)
+      {
+        mX = x;
+        mY = y;
+      }
+
+      // Default operation
+    public:
+      IntPair(const IntPair&) = default;            ///< Default copy constructor
+      IntPair(IntPair&&)      = default;            ///< Default move constructor
+      IntPair& operator=(const IntPair&) = default; ///< Default copy assignment operator
+      IntPair& operator=(IntPair&&) = default;      ///< Default move assignment operator
+
+      // member data
+    private:
+      int mX;
+      int mY;
+    };
+
+public:
   using WindowSize     = Uint16Pair;
+  using WindowPosition = Dali::Window::IntPair;
 
   using KeyEventSignalType = Signal< void (const KeyEvent&) >;
   using TouchEventSignalType = Signal< void (const TouchEvent&) >;