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
Changes after adaptor integration-api folder move
[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
..
e1ad7f2
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
@@
-25,7
+25,7
@@
#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>
// INTERNAL INCLUDES
#include <toolkit-adaptor-impl.h>
// INTERNAL INCLUDES
@@
-48,7
+48,9
@@
namespace Adaptor
{
Window::Window( const PositionSize& positionSize )
{
Window::Window( const PositionSize& positionSize )
-: SceneHolder( positionSize )
+: SceneHolder( positionSize ),
+ mFocusChangeSignal(),
+ mVisibilityChangedSignal()
{
}
{
}
@@
-155,6
+157,11
@@
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;
@@
-210,6
+217,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