From a816a5a81789a4156ce924d771a10ecc6544e725 Mon Sep 17 00:00:00 2001 From: tscholb Date: Wed, 2 Nov 2022 16:51:50 +0900 Subject: [PATCH] Revert "[Tizen] Modify window position data type" This reverts commit e0b23b20adfe7b3d41971a2117e3225c7fa93493. --- .../dali-toolkit-test-utils/toolkit-window-impl.h | 7 ++--- .../dali-toolkit-test-utils/toolkit-window.cpp | 4 +-- .../dali-toolkit-test-utils/toolkit-window.h | 30 ---------------------- 3 files changed, 6 insertions(+), 35 deletions(-) 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 58d344e..9044964 100644 --- 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,6 +30,7 @@ namespace Dali { using PositionSize = Dali::Rect; +using WindowPosition = Uint16Pair; namespace Internal { @@ -44,9 +45,9 @@ public: virtual ~Window() = default; static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent); - Dali::Window::WindowPosition GetPosition() const; - PositionSize GetPositionSize() const; - Dali::Window::WindowSize GetSize() const; + 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 2746ad9..9fc2763 100644 --- 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 ); } -Dali::Window::WindowPosition Window::GetPosition() const +WindowPosition Window::GetPosition() const { PositionSize positionSize = mRenderSurface.GetPositionSize(); - return Dali::Window::WindowPosition(positionSize.x, positionSize.y); + return 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 5cc10d7..0d4e219 100644 --- 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,37 +52,7 @@ 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&) >; -- 2.7.4