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=ed4d02ca9da15ae43363fb503da5f4dce51373c3;hp=86400028e18c5c4a91198feca8dd70c3e9c9ad2c;hb=1e7f2e72fcc37576c754ca2ed563ece458942960;hpb=00ef589046a32c53d20de1c61af7cc69524e51dc 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 8640002..ed4d02c 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 @@ -1,21 +1,27 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #include "dummy-control.h" +#include +#include +#include +#include + namespace Dali { @@ -23,14 +29,11 @@ namespace Toolkit { DummyControl::DummyControl() -: mCustomSlot1Called(false) { } DummyControl::DummyControl(const DummyControl& control) -: Control( control ), - mCustomSlot1Called(false), - mCustomSlot1Value(Vector3::ZERO) +: Control( control ) { } @@ -50,10 +53,24 @@ DummyControl& DummyControl::operator=(const DummyControl& control) } // Used to test signal connections -void DummyControl::CustomSlot1( Actor actor, const Vector3& value ) +void DummyControlImpl::CustomSlot1( Actor actor ) { mCustomSlot1Called = true; - mCustomSlot1Value = value; +} + +namespace { + +BaseHandle Create() +{ + return DummyControlImpl::New(); +} + +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::DummyControl, Toolkit::Control, Create ); +DALI_TYPE_REGISTRATION_END() + +Dali::PropertyRegistration dummyControlVisualProperty( + typeRegistration, "testVisual", Dali::Toolkit::DummyControl::Property::TEST_VISUAL, Dali::Property::MAP, &Dali::Toolkit::DummyControlImpl::SetProperty, &Dali::Toolkit::DummyControlImpl::GetProperty ); + } DummyControl DummyControlImpl::New() @@ -65,7 +82,8 @@ DummyControl DummyControlImpl::New() } DummyControlImpl::DummyControlImpl() -: Control(true) +: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_HOVER_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), + mCustomSlot1Called(false) { } @@ -73,6 +91,66 @@ DummyControlImpl::~DummyControlImpl() { } +void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual ) +{ + Control::RegisterVisual( index, visual ); + + VisualIndices::iterator iter = std::find( mRegisteredVisualIndices.begin(), mRegisteredVisualIndices.end(), index ); + if( iter == mRegisteredVisualIndices.end() ) + { + mRegisteredVisualIndices.push_back(index); + } +} + +void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual, bool enabled ) +{ + Control::RegisterVisual( index, visual, enabled ); + + VisualIndices::iterator iter = std::find( mRegisteredVisualIndices.begin(), mRegisteredVisualIndices.end(), index ); + if( iter == mRegisteredVisualIndices.end() ) + { + mRegisteredVisualIndices.push_back(index); + } +} + +void DummyControlImpl::UnregisterVisual( Property::Index index ) +{ + Control::UnregisterVisual( index ); +} + +Toolkit::Visual::Base DummyControlImpl::GetVisual( Property::Index index ) +{ + return Control::GetVisual( index ); +} + +void DummyControlImpl::EnableVisual( Property::Index index, bool enabled ) +{ + Control::EnableVisual( index, enabled ); +} + +bool DummyControlImpl::IsVisualEnabled( Property::Index index ) +{ + return Control::IsVisualEnabled( index ); +} + + +Animation DummyControlImpl::CreateTransition( const Toolkit::TransitionData& transition ) +{ + return Control::CreateTransition( transition ); +} + +void DummyControlImpl::SetProperty( BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value ) +{ +} + +Property::Value DummyControlImpl::GetProperty( BaseObject* object, Dali::Property::Index propertyIndex ) +{ + Dali::Property::Value value; + return value; +} + + + DummyControl DummyControlImplOverride::New() { IntrusivePtr< DummyControlImplOverride > impl = new DummyControlImplOverride; @@ -85,7 +163,11 @@ DummyControl DummyControlImplOverride::New() DummyControlImplOverride::DummyControlImplOverride() : DummyControlImpl(), initializeCalled(false), - styleChangeCalled(false), + activatedCalled(false), + onAccTouchedCalled(false), + onAccValueChangeCalled(false), + themeChangeCalled(false), + fontChangeCalled(false), pinchCalled(false), panCalled(false), tapCalled(false), @@ -97,7 +179,8 @@ DummyControlImplOverride::DummyControlImplOverride() sizeSetCalled(false), sizeAnimationCalled(false), touchEventCalled(false), - mouseWheelEventCalled(false), + hoverEventCalled(false), + wheelEventCalled(false), keyEventCalled(false), keyInputFocusGained(false), keyInputFocusLost(false) @@ -108,23 +191,53 @@ DummyControlImplOverride::~DummyControlImplOverride() { } void DummyControlImplOverride::OnInitialize() { initializeCalled = true; } -void DummyControlImplOverride::OnStyleChange(StyleChange change) { styleChangeCalled = true;} -void DummyControlImplOverride::OnPinch(PinchGesture pinch) { pinchCalled = true; } -void DummyControlImplOverride::OnPan(PanGesture pan) { panCalled = true; } -void DummyControlImplOverride::OnTap(TapGesture tap) { tapCalled = true; } -void DummyControlImplOverride::OnLongPress(LongPressGesture longPress) { longPressCalled = true; } -void DummyControlImplOverride::OnStageConnection() { stageConnectionCalled = true; } -void DummyControlImplOverride::OnStageDisconnection() { stageDisconnectionCalled = 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; } +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; + fontChangeCalled = change == StyleChange::DEFAULT_FONT_SIZE_CHANGE; +} +void DummyControlImplOverride::OnPinch(const PinchGesture& pinch) { pinchCalled = 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( int depth ) { stageConnectionCalled = true; Control::OnStageConnection( depth ); } +void DummyControlImplOverride::OnStageDisconnection() { stageDisconnectionCalled = true; Control::OnStageDisconnection(); } +void DummyControlImplOverride::OnChildAdd(Actor& child) { childAddCalled = true; Control::OnChildAdd( child ); } +void DummyControlImplOverride::OnChildRemove(Actor& child) { childRemoveCalled = true; Control::OnChildRemove( child ); } +void DummyControlImplOverride::OnSizeSet(const Vector3& targetSize) { sizeSetCalled = true; Control::OnSizeSet( targetSize ); } +void DummyControlImplOverride::OnSizeAnimation(Animation& animation, const Vector3& targetSize) { sizeAnimationCalled = true; Control::OnSizeAnimation( animation, targetSize ); } bool DummyControlImplOverride::OnTouchEvent(const TouchEvent& event) { touchEventCalled = true; return false; } -bool DummyControlImplOverride::OnMouseWheelEvent(const MouseWheelEvent& event) { mouseWheelEventCalled = 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::OnKeyEvent(const KeyEvent& event) { keyEventCalled = true; return false;} void DummyControlImplOverride::OnKeyInputFocusGained() { keyInputFocusGained = true; } void DummyControlImplOverride::OnKeyInputFocusLost() { keyInputFocusLost = true; } +void DummyControlImplOverride::OnRelayout( const Vector2& size, RelayoutContainer& container ) +{ + Property::Map transformMap; + transformMap + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) + .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) + .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) + .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO ); + + for( VisualIndices::iterator iter = mRegisteredVisualIndices.begin(); iter != mRegisteredVisualIndices.end() ; ++iter ) + { + Visual::Base visual = GetVisual(*iter); + visual.SetTransformAndSize( transformMap, size ); + } +} + + DummyControl DummyControl::New( bool override ) { DummyControl control; @@ -142,16 +255,12 @@ DummyControl DummyControl::New( bool override ) } DummyControl::DummyControl( DummyControlImpl& implementation ) -: Control( implementation ), - mCustomSlot1Called(false), - mCustomSlot1Value(Vector3::ZERO) +: Control( implementation ) { } DummyControl::DummyControl( Dali::Internal::CustomActor* internal ) -: Control( internal ), - mCustomSlot1Called(false), - mCustomSlot1Value(Vector3::ZERO) +: Control( internal ) { VerifyCustomActorPointer(internal); }