X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-window.h;h=836fd1f24d80f51203ed4d751869f00a390200cc;hb=79e6a6915a8d9cb20a2c938afeef6de0bc705d83;hp=2ff4370a1eac002d1924c96ea19add582fb4456c;hpb=77af66aef5b24b239f271ef76bd7f21ea103f91c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 2ff4370..836fd1f 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
@@ -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,21 +19,22 @@
  */
 
 //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;
-struct KeyEvent;
-class TouchData;
-struct WheelEvent;
+class KeyEvent;
+class TouchEvent;
+class WheelEvent;
 
 typedef Dali::Rect<int> PositionSize;
 
@@ -43,16 +44,21 @@ namespace Adaptor
 {
 class Window;
 }
-}
+} // namespace Internal
 
 class Window;
-typedef Signal< void (Window,bool) > FocusChangeSignalType;
+typedef Signal<void(Window, bool)>       FocusChangeSignalType;
+typedef Signal<void(Window, Uint16Pair)> ResizeSignalType;
 
 class Window : public BaseHandle
 {
 public:
-  using KeyEventSignalType = Signal< void (const KeyEvent&) >;
-  using TouchSignalType = Signal< void (const TouchData&) >;
+  using WindowSize     = Uint16Pair;
+  using WindowPosition = Int32Pair;
+
+  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);
@@ -61,42 +67,52 @@ public:
   ~Window();
   Window(const Window& handle);
   Window& operator=(const 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();
-  FocusChangeSignalType& FocusChangeSignal();
-  KeyEventSignalType& KeyEventSignal();
-  TouchSignalType& TouchSignal();
+  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< void ( Window, bool ) > VisibilityChangedSignalType;
-
-Dali::Window Get( Actor actor );
-Dali::Window DownCast(  BaseHandle handle );
-
-EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window );
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
-WheelEventSignalType& WheelEventSignal( 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