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
Merge "fix issue when strikethrough used without ending tag" into 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
d0a3e4f
..
9fc2763
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
@@
-48,6
+48,7
@@
Window::Window( const PositionSize& positionSize )
mFocusChangeSignal(),
mResizeSignal(),
mRotationAngle(90), // dummy angle for test coverage
mFocusChangeSignal(),
mResizeSignal(),
mRotationAngle(90), // dummy angle for test coverage
+ mVisible(true),
mVisibilityChangedSignal()
{
}
mVisibilityChangedSignal()
{
}
@@
-183,6
+184,12
@@
void Window::Raise()
void Window::Hide()
{
GetImplementation( *this ).mVisibilityChangedSignal.Emit( *this, false );
void Window::Hide()
{
GetImplementation( *this ).mVisibilityChangedSignal.Emit( *this, false );
+ GetImplementation( *this ).mVisible = false;
+}
+
+bool Window::IsVisible() const
+{
+ return GetImplementation( *this ).mVisible;
}
FocusChangeSignalType& Window::FocusChangeSignal()
}
FocusChangeSignalType& Window::FocusChangeSignal()
@@
-265,6
+272,11
@@
WheelEventSignalType& WheelEventSignal( Window window )
return GetImplementation( window ).WheelEventSignal();
}
return GetImplementation( window ).WheelEventSignal();
}
+WheelEventGeneratedSignalType& WheelEventGeneratedSignal( Window window )
+{
+ return GetImplementation( window ).WheelEventGeneratedSignal();
+}
+
VisibilityChangedSignalType& VisibilityChangedSignal( Window window )
{
return GetImplementation( window ).mVisibilityChangedSignal;
VisibilityChangedSignalType& VisibilityChangedSignal( Window window )
{
return GetImplementation( window ).mVisibilityChangedSignal;