Modify window position data type

Current WindowPosition has the unsigned int data type.
It means that current data type can not support the negative coordinate.
This patch is to support it.

Change-Id: I2865ab926bb19853c7ecb4babd82384b5d673623

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..836fd1f 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
@@ -2,7 +2,7 @@
 #define TOOLKIT_WINDOW_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,16 @@
  */
 
 //EXTERNAL INCLUDES
-#include <string>
+#include <dali/integration-api/scene.h>
+#include <dali/public-api/math/int-pair.h>
 #include <dali/public-api/math/rect.h>
+#include <dali/public-api/math/uint-16-pair.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal.h>
-#include <dali/integration-api/scene.h>
+#include <string>
 
 namespace Dali
 {
-
 class Actor;
 class Layer;
 class RenderSurfaceInterface;
@@ -43,20 +44,21 @@ namespace Adaptor
 {
 class Window;
 }
-}
+} // namespace Internal
 
 class Window;
-typedef Signal< void (Window,bool) > FocusChangeSignalType;
-typedef Signal< void (Window,Uint16Pair) > ResizeSignalType;
+typedef Signal<void(Window, bool)>       FocusChangeSignalType;
+typedef Signal<void(Window, Uint16Pair)> ResizeSignalType;
 
 class Window : public BaseHandle
 {
 public:
   using WindowSize     = Uint16Pair;
+  using WindowPosition = Int32Pair;
 
-  using KeyEventSignalType = Signal< void (const KeyEvent&) >;
-  using TouchEventSignalType = Signal< void (const TouchEvent&) >;
-  using ResizeSignalType      = Signal<void(Window, WindowSize)>;
+  using KeyEventSignalType   = Signal<void(const KeyEvent&)>;
+  using TouchEventSignalType = Signal<void(const TouchEvent&)>;
+  using ResizeSignalType     = Signal<void(Window, WindowSize)>;
 
   static Window New(PositionSize windowPosition, const std::string& name, bool isTransparent = false);
   static Window New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent = false);
@@ -65,52 +67,52 @@ public:
   ~Window();
   Window(const Window& handle);
   Window& operator=(const Window& rhs);
-  Window( Window&& rhs );
-  Window& operator=( Window&& rhs );
+  Window(Window&& rhs);
+  Window& operator=(Window&& rhs);
 
-  Integration::Scene GetScene();
+  Integration::Scene            GetScene();
   Dali::RenderSurfaceInterface& GetRenderSurface();
-  void Add( Dali::Actor actor );
-  void Remove( Dali::Actor actor );
-  Dali::Layer GetRootLayer() const;
-  void SetBackgroundColor( const Vector4& color );
-  Vector4 GetBackgroundColor() const;
-  void Raise();
-  void Hide();
-  bool IsVisible() const;
-  FocusChangeSignalType& FocusChangeSignal();
-  KeyEventSignalType& KeyEventSignal();
-  TouchEventSignalType& TouchedSignal();
-  ResizeSignalType& ResizeSignal();
+  void                          Add(Dali::Actor actor);
+  void                          Remove(Dali::Actor actor);
+  Dali::Layer                   GetRootLayer() const;
+  void                          SetBackgroundColor(const Vector4& color);
+  Vector4                       GetBackgroundColor() const;
+  void                          Raise();
+  void                          Hide();
+  bool                          IsVisible() const;
+  FocusChangeSignalType&        FocusChangeSignal();
+  KeyEventSignalType&           KeyEventSignal();
+  TouchEventSignalType&         TouchedSignal();
+  ResizeSignalType&             ResizeSignal();
 
 public:
-  explicit Window( Internal::Adaptor::Window* window );
+  explicit Window(Internal::Adaptor::Window* window);
 };
 
-Internal::Adaptor::Window& GetImplementation(Dali::Window& window);
+Internal::Adaptor::Window&       GetImplementation(Dali::Window& window);
 const Internal::Adaptor::Window& GetImplementation(const Dali::Window& window);
 
 namespace DevelWindow
 {
-typedef Signal< void () > EventProcessingFinishedSignalType;
-typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType;
-typedef Signal< void (const WheelEvent&) > WheelEventSignalType;
-typedef Signal< bool (const WheelEvent&) > WheelEventGeneratedSignalType;
-typedef Signal< void ( Window, bool ) > VisibilityChangedSignalType;
-
-Dali::Window Get( Actor actor );
-Dali::Window DownCast(  BaseHandle handle );
-void SetPositionSize(Window window, PositionSize positionSize);
-int GetPhysicalOrientation(Window window);
-void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId );
-void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId );
-
-EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window );
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
-WheelEventSignalType& WheelEventSignal( Window window );
-WheelEventGeneratedSignalType& WheelEventGeneratedSignal( Dali::Window window );
-VisibilityChangedSignalType& VisibilityChangedSignal( Window window );
-}
+typedef Signal<void()>                  EventProcessingFinishedSignalType;
+typedef Signal<bool(const KeyEvent&)>   KeyEventGeneratedSignalType;
+typedef Signal<void(const WheelEvent&)> WheelEventSignalType;
+typedef Signal<bool(const WheelEvent&)> WheelEventGeneratedSignalType;
+typedef Signal<void(Window, bool)>      VisibilityChangedSignalType;
+
+Dali::Window Get(Actor actor);
+Dali::Window DownCast(BaseHandle handle);
+void         SetPositionSize(Window window, PositionSize positionSize);
+int          GetPhysicalOrientation(Window window);
+void         AddFrameRenderedCallback(Window window, std::unique_ptr<CallbackBase> callback, int32_t frameId);
+void         AddFramePresentedCallback(Window window, std::unique_ptr<CallbackBase> callback, int32_t frameId);
+
+EventProcessingFinishedSignalType& EventProcessingFinishedSignal(Window window);
+KeyEventGeneratedSignalType&       KeyEventGeneratedSignal(Dali::Window window);
+WheelEventSignalType&              WheelEventSignal(Window window);
+WheelEventGeneratedSignalType&     WheelEventGeneratedSignal(Dali::Window window);
+VisibilityChangedSignalType&       VisibilityChangedSignal(Window window);
+} // namespace DevelWindow
 
 } // namespace Dali