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 "Cleaning up RendererFactory API" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dummy-control.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index
20a5041
..
1a3490b
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@
-17,7
+17,7
@@
#include "dummy-control.h"
#include "dummy-control.h"
-#include <dali-toolkit/d
evel-api/styling/style-manager
.h>
+#include <dali-toolkit/d
ali-toolkit
.h>
namespace Dali
{
namespace Dali
{
@@
-87,8
+87,10
@@
DummyControlImplOverride::DummyControlImplOverride()
: DummyControlImpl(),
initializeCalled(false),
activatedCalled(false),
: DummyControlImpl(),
initializeCalled(false),
activatedCalled(false),
- themeChangeCalled( false ),
- fontChangeCalled( false ),
+ onAccTouchedCalled(false),
+ onAccValueChangeCalled(false),
+ themeChangeCalled(false),
+ fontChangeCalled(false),
pinchCalled(false),
panCalled(false),
tapCalled(false),
pinchCalled(false),
panCalled(false),
tapCalled(false),
@@
-112,7
+114,13
@@
DummyControlImplOverride::~DummyControlImplOverride() { }
void DummyControlImplOverride::OnInitialize() { initializeCalled = true; }
void DummyControlImplOverride::OnInitialize() { initializeCalled = true; }
-void DummyControlImplOverride::OnActivated() { activatedCalled = true; }
+bool DummyControlImplOverride::OnAccessibilityActivated() { activatedCalled = true; return true; }
+bool DummyControlImplOverride::OnAccessibilityTouch(const TouchEvent& touchEvent) { onAccTouchedCalled = true; return true; }
+bool DummyControlImplOverride::OnAccessibilityValueChange( bool isIncrease )
+{
+ onAccValueChangeCalled = true; return true;
+}
+
void DummyControlImplOverride::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
{
themeChangeCalled = change == StyleChange::THEME_CHANGE;
void DummyControlImplOverride::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
{
themeChangeCalled = change == StyleChange::THEME_CHANGE;
@@
-122,12
+130,12
@@
void DummyControlImplOverride::OnPinch(const PinchGesture& pinch) { pinchCalled
void DummyControlImplOverride::OnPan(const PanGesture& pan) { panCalled = true; }
void DummyControlImplOverride::OnTap(const TapGesture& tap) { tapCalled = true; }
void DummyControlImplOverride::OnLongPress(const LongPressGesture& longPress) { longPressCalled = true; }
void DummyControlImplOverride::OnPan(const PanGesture& pan) { panCalled = true; }
void DummyControlImplOverride::OnTap(const TapGesture& tap) { tapCalled = true; }
void DummyControlImplOverride::OnLongPress(const LongPressGesture& longPress) { longPressCalled = true; }
-void DummyControlImplOverride::OnStageConnection(
unsigned int depth ) {
stageConnectionCalled = true; }
-void DummyControlImplOverride::OnStageDisconnection() { stageDisconnectionCalled = true; }
+void DummyControlImplOverride::OnStageConnection(
int depth ) { Control::OnStageConnection( depth );
stageConnectionCalled = true; }
+void DummyControlImplOverride::OnStageDisconnection() { stageDisconnectionCalled = true;
Control::OnStageDisconnection();
}
void DummyControlImplOverride::OnChildAdd(Actor& child) { childAddCalled = true; }
void DummyControlImplOverride::OnChildRemove(Actor& child) { childRemoveCalled = true; }
void DummyControlImplOverride::OnChildAdd(Actor& child) { childAddCalled = true; }
void DummyControlImplOverride::OnChildRemove(Actor& child) { childRemoveCalled = true; }
-void DummyControlImplOverride::OnSizeSet(const Vector3& targetSize) { sizeSetCalled = true; }
-void DummyControlImplOverride::OnSizeAnimation(Animation& animation, const Vector3& targetSize) { sizeAnimationCalled = true; }
+void DummyControlImplOverride::OnSizeSet(const Vector3& targetSize) {
Control::OnSizeSet( targetSize );
sizeSetCalled = true; }
+void DummyControlImplOverride::OnSizeAnimation(Animation& animation, const Vector3& targetSize) {
Control::OnSizeAnimation( animation, targetSize );
sizeAnimationCalled = true; }
bool DummyControlImplOverride::OnTouchEvent(const TouchEvent& event) { touchEventCalled = true; return false; }
bool DummyControlImplOverride::OnHoverEvent(const HoverEvent& event) { hoverEventCalled = true; return false; }
bool DummyControlImplOverride::OnWheelEvent(const WheelEvent& event) { wheelEventCalled = true; return false; }
bool DummyControlImplOverride::OnTouchEvent(const TouchEvent& event) { touchEventCalled = true; return false; }
bool DummyControlImplOverride::OnHoverEvent(const HoverEvent& event) { hoverEventCalled = true; return false; }
bool DummyControlImplOverride::OnWheelEvent(const WheelEvent& event) { wheelEventCalled = true; return false; }