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=3557c0de57c76b55b8c6e62bf2da88c4aecead7a;hp=7f784b69815f0d067cda5f0c5e2b468e3d2ba382;hb=56d412791a44c2a79135d2293c13fddb135c9d54;hpb=1846ed9e60412dbb8aab06aa6bd7c0027d242ac0 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 7f784b6..3557c0d 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 @@ -50,10 +50,9 @@ DummyControl& DummyControl::operator=(const DummyControl& control) } // Used to test signal connections -void DummyControlImpl::CustomSlot1( Actor actor, const Vector3& value ) +void DummyControlImpl::CustomSlot1( Actor actor ) { mCustomSlot1Called = true; - mCustomSlot1Value = value; } DummyControl DummyControlImpl::New() @@ -66,8 +65,7 @@ DummyControl DummyControlImpl::New() DummyControlImpl::DummyControlImpl() : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), - mCustomSlot1Called(false), - mCustomSlot1Value(Vector3::ZERO) + mCustomSlot1Called(false) { } @@ -112,8 +110,7 @@ DummyControlImplOverride::~DummyControlImplOverride() { } void DummyControlImplOverride::OnInitialize() { initializeCalled = true; } -void DummyControlImplOverride::OnThemeChange(StyleManager change) { themeChangeCalled = true;} -void DummyControlImplOverride::OnFontChange(bool defaultFontChange, bool defaultFontSizeChange) { fontChangeCalled = true; } +void DummyControlImplOverride::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) { themeChangeCalled = change.themeChange; fontChangeCalled = change.defaultFontSizeChange; } void DummyControlImplOverride::OnPinch(const PinchGesture& pinch) { pinchCalled = true; } void DummyControlImplOverride::OnPan(const PanGesture& pan) { panCalled = true; } void DummyControlImplOverride::OnTap(const TapGesture& tap) { tapCalled = true; }