projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.0.10] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-window.cpp
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
9849f60
..
9e9ca35
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
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-21,16
+21,12
@@
// EXTERNAL INCLUDES
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/layer.h>
// EXTERNAL INCLUDES
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/layer.h>
-#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/base-object.h>
#define DALI_WINDOW_H
#include <dali/public-api/object/base-object.h>
#define DALI_WINDOW_H
-#include <dali/integration-api/adaptor
s
/adaptor.h>
+#include <dali/integration-api/adaptor
-framework
/adaptor.h>
#include <toolkit-adaptor-impl.h>
#include <toolkit-adaptor-impl.h>
-// INTERNAL INCLUDES
-#include "test-render-surface.h"
-
using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
namespace Dali
using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
namespace Dali
@@
-48,7
+44,9
@@
namespace Adaptor
{
Window::Window( const PositionSize& positionSize )
{
Window::Window( const PositionSize& positionSize )
-: SceneHolder( positionSize )
+: SceneHolder( positionSize ),
+ mFocusChangeSignal(),
+ mVisibilityChangedSignal()
{
}
{
}
@@
-82,16
+80,13
@@
Window::~Window()
{
}
{
}
-Window::Window(const Window& handle)
-: BaseHandle( handle )
-{
-}
+Window::Window( const Window& copy ) = default;
-Window& Window::operator=(
const Window& rhs)
-{
-
BaseHandle::operator=(rhs)
;
- return *this;
-}
+Window& Window::operator=(
const Window& rhs ) = default;
+
+
Window::Window( Window&& rhs ) = default
;
+
+Window& Window::operator=( Window&& rhs ) = default;
Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent )
{
Dali::Window Window::New( PositionSize windowPosition, const std::string& name, bool isTransparent )
{
@@
-120,7
+115,7
@@
Integration::Scene Window::GetScene()
return GetImplementation( *this ).GetScene();
}
return GetImplementation( *this ).GetScene();
}
-
Integration::RenderSu
rface& Window::GetRenderSurface()
+
Dali::RenderSurfaceInte
rface& Window::GetRenderSurface()
{
return GetImplementation( *this ).GetRenderSurface();
}
{
return GetImplementation( *this ).GetRenderSurface();
}
@@
-155,11
+150,26
@@
void Window::Raise()
GetImplementation( *this ).mFocusChangeSignal.Emit(*this, true);
}
GetImplementation( *this ).mFocusChangeSignal.Emit(*this, true);
}
+void Window::Hide()
+{
+ GetImplementation( *this ).mVisibilityChangedSignal.Emit( *this, false );
+}
+
FocusChangeSignalType& Window::FocusChangeSignal()
{
return GetImplementation( *this ).mFocusChangeSignal;
}
FocusChangeSignalType& Window::FocusChangeSignal()
{
return GetImplementation( *this ).mFocusChangeSignal;
}
+Window::KeyEventSignalType& Window::KeyEventSignal()
+{
+ return GetImplementation( *this ).KeyEventSignal();
+}
+
+Window::TouchEventSignalType& Window::TouchedSignal()
+{
+ return GetImplementation( *this ).TouchedSignal();
+}
+
namespace DevelWindow
{
namespace DevelWindow
{
@@
-185,24
+195,24
@@
Window DownCast( BaseHandle handle )
return Dali::Window( windowImpl );
}
return Dali::Window( windowImpl );
}
-
EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window
)
+
void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId
)
{
{
-
return GetImplementation( window ).GetScene().EventProcessingFinishedSignal(
);
+
CallbackBase::Execute( *callback, frameId
);
}
}
-
KeyEventSignalType& KeyEventSignal( Window window
)
+
void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId
)
{
{
-
return GetImplementation( window ).KeyEventSignal(
);
+
CallbackBase::Execute( *callback, frameId
);
}
}
-
KeyEventGeneratedSignalType& KeyEventGenerat
edSignal( Window window )
+
EventProcessingFinishedSignalType& EventProcessingFinish
edSignal( Window window )
{
{
- return GetImplementation( window ).
KeyEventGenerat
edSignal();
+ return GetImplementation( window ).
GetScene().EventProcessingFinish
edSignal();
}
}
-
TouchSignalType& Touch
Signal( Window window )
+
KeyEventGeneratedSignalType& KeyEventGenerated
Signal( Window window )
{
{
- return GetImplementation( window ).
Touch
Signal();
+ return GetImplementation( window ).
KeyEventGenerated
Signal();
}
WheelEventSignalType& WheelEventSignal( Window window )
}
WheelEventSignalType& WheelEventSignal( Window window )
@@
-210,6
+220,11
@@
WheelEventSignalType& WheelEventSignal( Window window )
return GetImplementation( window ).WheelEventSignal();
}
return GetImplementation( window ).WheelEventSignal();
}
+VisibilityChangedSignalType& VisibilityChangedSignal( Window window )
+{
+ return GetImplementation( window ).mVisibilityChangedSignal;
+}
+
} // namespace DevelWindow
} // Dali
} // namespace DevelWindow
} // Dali