(Automated Tests) Changes after Window changes in Adaptor

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-window.h

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 271f885..2ff4370 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) 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,6 +30,7 @@ namespace Dali
 
 class Actor;
 class Layer;
+class RenderSurfaceInterface;
 struct KeyEvent;
 class TouchData;
 struct WheelEvent;
@@ -50,6 +51,8 @@ typedef Signal< void (Window,bool) > FocusChangeSignalType;
 class Window : public BaseHandle
 {
 public:
+  using KeyEventSignalType = Signal< void (const KeyEvent&) >;
+  using TouchSignalType = Signal< void (const TouchData&) >;
 
   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);
@@ -60,7 +63,7 @@ public:
   Window& operator=(const 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;
@@ -69,6 +72,8 @@ public:
   void Raise();
   void Hide();
   FocusChangeSignalType& FocusChangeSignal();
+  KeyEventSignalType& KeyEventSignal();
+  TouchSignalType& TouchSignal();
 
 public:
   explicit Window( Internal::Adaptor::Window* window );
@@ -80,9 +85,7 @@ const Internal::Adaptor::Window& GetImplementation(const Dali::Window& window);
 namespace DevelWindow
 {
 typedef Signal< void () > EventProcessingFinishedSignalType;
-typedef Signal< void (const KeyEvent&) > KeyEventSignalType;
 typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType;
-typedef Signal< void (const TouchData&) > TouchSignalType;
 typedef Signal< void (const WheelEvent&) > WheelEventSignalType;
 typedef Signal< void ( Window, bool ) > VisibilityChangedSignalType;
 
@@ -90,9 +93,7 @@ Dali::Window Get( Actor actor );
 Dali::Window DownCast(  BaseHandle handle );
 
 EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window );
-KeyEventSignalType& KeyEventSignal( Dali::Window window );
 KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
-TouchSignalType& TouchSignal( Dali::Window window );
 WheelEventSignalType& WheelEventSignal( Window window );
 VisibilityChangedSignalType& VisibilityChangedSignal( Window window );
 }