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=2291139756a26f4082c7055c040f4afdb2210e43;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hp=c830af5c3b8cfefb381819428579612912d721be;hpb=6d96d7c0b6a74a5fe927dcaa2d9b1fae932af08d;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 c830af5..2291139 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) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -30,9 +30,10 @@ namespace Dali
 
 class Actor;
 class Layer;
-struct KeyEvent;
-class TouchData;
-struct WheelEvent;
+class RenderSurfaceInterface;
+class KeyEvent;
+class TouchEvent;
+class WheelEvent;
 
 typedef Dali::Rect<int> PositionSize;
 
@@ -44,9 +45,14 @@ class Window;
 }
 }
 
+class Window;
+typedef Signal< void (Window,bool) > FocusChangeSignalType;
+
 class Window : public BaseHandle
 {
 public:
+  using KeyEventSignalType = Signal< void (const KeyEvent&) >;
+  using TouchEventSignalType = Signal< void (const TouchEvent&) >;
 
   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);
@@ -55,29 +61,45 @@ public:
   ~Window();
   Window(const Window& handle);
   Window& operator=(const Window& rhs);
-  Layer GetRootLayer() const;
+  Window( Window&& rhs );
+  Window& operator=( Window&& rhs );
 
   Integration::Scene GetScene();
-  Integration::RenderSurface& GetRenderSurface();
+  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();
+  TouchEventSignalType& TouchedSignal();
 
 public:
   explicit Window( Internal::Adaptor::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< void (const KeyEvent&) > KeyEventSignalType;
-typedef Signal< void (const TouchData&) > TouchSignalType;
+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 );
+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 );
-KeyEventSignalType& KeyEventSignal( Dali::Window window );
-TouchSignalType& TouchSignal( Dali::Window window );
+KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
 WheelEventSignalType& WheelEventSignal( Window window );
-
+VisibilityChangedSignalType& VisibilityChangedSignal( Window window );
 }
 
 } // namespace Dali