X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.cpp;h=8e1473ea7c4652340406f49307baf085586646b3;hp=181a259524ebe7c37242adcd0b3940de6afcf42c;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hpb=a881757839b7abb008873a68c67e17b3ba39669b 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 181a259..8e1473e 100644 --- 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,6 +17,8 @@ #include "dummy-control.h" +#include + namespace Dali { @@ -66,7 +68,7 @@ DummyControl DummyControlImpl::New() } DummyControlImpl::DummyControlImpl() -: ControlImpl(true) +: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ) { } @@ -86,7 +88,8 @@ DummyControl DummyControlImplOverride::New() DummyControlImplOverride::DummyControlImplOverride() : DummyControlImpl(), initializeCalled(false), - styleChangeCalled(false), + themeChangeCalled( false ), + fontChangeCalled( false ), pinchCalled(false), panCalled(false), tapCalled(false), @@ -109,7 +112,8 @@ DummyControlImplOverride::~DummyControlImplOverride() { } void DummyControlImplOverride::OnInitialize() { initializeCalled = true; } -void DummyControlImplOverride::OnStyleChange(StyleChange change) { styleChangeCalled = true;} +void DummyControlImplOverride::OnThemeChange(StyleManager change) { themeChangeCalled = true;} +void DummyControlImplOverride::OnFontChange(bool defaultFontChange, bool defaultFontSizeChange) { fontChangeCalled = true; } void DummyControlImplOverride::OnPinch(PinchGesture pinch) { pinchCalled = true; } void DummyControlImplOverride::OnPan(PanGesture pan) { panCalled = true; } void DummyControlImplOverride::OnTap(TapGesture tap) { tapCalled = true; }