X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=f777b004aad2845e477d0072b1837c66a3ba7584;hp=58d2d92d83b80638ff13988c93e63a90b56abf8d;hb=f4a28993f3f77f15015e5c9b4e1bedd06e23b926;hpb=670cb07df58286ca6f155c1b8e1455af948aac84 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 58d2d92..f777b00 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -38,10 +38,12 @@ #include #include #include +#include #include #include #include #include +#include namespace Dali { @@ -52,6 +54,10 @@ namespace Toolkit namespace { +#if defined(DEBUG_ENABLED) +Debug::Filter* gLogFilter = Debug::Filter::New( Debug::General, false, "LOG_CONTROL_VISUALS"); +#endif + /** * Struct used to store Visual within the control, index is a unique key for each visual. */ @@ -59,13 +65,31 @@ struct RegisteredVisual { Property::Index index; Toolkit::Visual::Base visual; - Actor placementActor; bool enabled; - RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, Actor &aPlacementActor, bool aEnabled) : - index(aIndex), visual(aVisual), placementActor(aPlacementActor), enabled(aEnabled) {} + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, bool aEnabled) : + index(aIndex), visual(aVisual), enabled(aEnabled) {} +}; + +struct HandleIndex +{ + Handle handle; ///< a handle to the target object + Property::Index index; ///< The index of a property provided by the referenced object + + HandleIndex( ) + : handle(), + index( Property::INVALID_INDEX ) + { + } + + HandleIndex( Handle& handle, Property::Index index ) + : handle( handle ), + index( index ) + { + } }; + typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisualContainer; /** @@ -83,6 +107,65 @@ bool FindVisual( Property::Index targetIndex, RegisteredVisualContainer& visuals return false; } +HandleIndex GetVisualProperty( + Internal::Control& controlImpl, + RegisteredVisualContainer& visuals, + const std::string& visualName, + Property::Key propertyKey ) +{ +#if defined(DEBUG_ENABLED) + std::ostringstream oss; + oss << "Control::GetHandleIndex(" << visualName << ", " << propertyKey << ")" << std::endl; + DALI_LOG_INFO( gLogFilter, Debug::General, oss.str().c_str() ); +#endif + + // Find visualName in the control + RegisteredVisualContainer::Iterator iter; + for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) + { + if ( (*iter)->visual.GetName() == visualName ) + { + break; + } + } + + // Does it's renderer have an associated property? + if( iter != visuals.End() ) + { + Actor self = controlImpl.Self(); + Property::Index index = self.GetPropertyIndex( propertyKey ); + if( index != Property::INVALID_INDEX ) + { + // It's an actor property: + return HandleIndex( self, index ); + } + else + { + // Check if it is a renderer property: + if( self.GetRendererCount() > 0 ) + { + // @todo Need to use correct renderer index + Renderer renderer = self.GetRendererAt(0); + Property::Index index = renderer.GetPropertyIndex( propertyKey ); + if( index != Property::INVALID_INDEX ) + { + // It's a renderer property: + return HandleIndex( renderer, index ); + } + } + else + { + std::ostringstream oss; + oss << propertyKey; + DALI_LOG_WARNING( "Control::GetHandleIndex(%s, %s) No renderers\n", visualName.c_str(), oss.str().c_str() ); + } + } + } + Handle handle; + return HandleIndex( handle, Property::INVALID_INDEX ); +} + + /** * Creates control through type registry */ @@ -207,21 +290,21 @@ public: // Construction & Destruction Impl(Control& controlImpl) -: mControlImpl( controlImpl ), - mStyleName(""), - mBackgroundVisual(), - mBackgroundColor(Color::TRANSPARENT), - mStartingPinchScale( NULL ), - mKeyEventSignal(), - mPinchGestureDetector(), - mPanGestureDetector(), - mTapGestureDetector(), - mLongPressGestureDetector(), - mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), - mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ) -{ -} + : mControlImpl( controlImpl ), + mStyleName(""), + mBackgroundVisual(), + mBackgroundColor(Color::TRANSPARENT), + mStartingPinchScale( NULL ), + mKeyEventSignal(), + mPinchGestureDetector(), + mPanGestureDetector(), + mTapGestureDetector(), + mLongPressGestureDetector(), + mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mIsKeyboardNavigationSupported( false ), + mIsKeyboardFocusGroup( false ) + { + } ~Impl() { @@ -475,13 +558,12 @@ const std::string& Control::GetStyleName() const void Control::SetBackgroundColor( const Vector4& color ) { - Actor self( Self() ); mImpl->mBackgroundColor = color; Property::Map map; - map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR; + map[ Toolkit::VisualProperty::TYPE ] = Toolkit::Visual::COLOR; map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); - RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, mImpl->mBackgroundVisual ); if( mImpl->mBackgroundVisual ) { mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); @@ -495,9 +577,8 @@ Vector4 Control::GetBackgroundColor() const void Control::SetBackground( const Property::Map& map ) { - Actor self( Self() ); mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); - RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, mImpl->mBackgroundVisual ); if( mImpl->mBackgroundVisual ) { mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); @@ -506,9 +587,8 @@ void Control::SetBackground( const Property::Map& map ) void Control::SetBackgroundImage( Image image ) { - Actor self( Self() ); mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); - RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, mImpl->mBackgroundVisual ); if( mImpl->mBackgroundVisual ) { mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); @@ -517,8 +597,11 @@ void Control::SetBackgroundImage( Image image ) void Control::ClearBackground() { - Actor self( Self() ); - mImpl->mBackgroundVisual.RemoveAndReset( self ); + if( mImpl->mBackgroundVisual ) + { + UnregisterVisual( Toolkit::Control::Property::BACKGROUND ); + mImpl->mBackgroundVisual.Reset(); + } mImpl->mBackgroundColor = Color::TRANSPARENT; } @@ -661,22 +744,16 @@ void Control::KeyboardEnter() OnKeyboardEnter(); } -void Control::RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual ) +void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ) { - RegisterVisual( index, placementActor, visual, true ); + RegisterVisual( index, visual, true ); } -void Control::RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual, bool enabled ) +void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ) { bool visualReplaced ( false ); - Actor actorToRegister; // Null actor, replaced if placement actor not Self Actor self = Self(); - if ( placementActor != self ) // Prevent increasing ref count if actor self - { - actorToRegister = placementActor; - } - if ( !mImpl->mVisuals.Empty() ) { RegisteredVisualContainer::Iterator iter; @@ -685,29 +762,21 @@ void Control::RegisterVisual( Property::Index index, Actor& placementActor, Tool { if( (*iter)->visual && self.OnStage() ) { - if( (*iter)->placementActor ) - { - (*iter)->visual.SetOffStage( (*iter)->placementActor ); - } - else - { - (*iter)->visual.SetOffStage( self ); - } + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); } (*iter)->visual = visual; - (*iter)->placementActor = actorToRegister; visualReplaced = true; } } if ( !visualReplaced ) // New registration entry { - mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, actorToRegister, enabled ) ); + mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, enabled ) ); } if( visual && self.OnStage() && enabled ) { - visual.SetOnStage( placementActor ); + Toolkit::GetImplementation(visual).SetOnStage( self ); } } @@ -716,6 +785,9 @@ void Control::UnregisterVisual( Property::Index index ) RegisteredVisualContainer::Iterator iter; if ( FindVisual( index, mImpl->mVisuals, iter ) ) { + Actor self( Self() ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); + (*iter)->visual.Reset(); mImpl->mVisuals.Erase( iter ); } } @@ -743,21 +815,16 @@ void Control::EnableVisual( Property::Index index, bool enable ) (*iter)->enabled = enable; Actor parentActor = Self(); - if ( (*iter)->placementActor ) - { - parentActor = (*iter)->placementActor; - } - if ( Self().OnStage() ) // If control not on Stage then Visual will be added when StageConnection is called. { if ( enable ) { - (*iter)->visual.SetOnStage( parentActor ); + Toolkit::GetImplementation((*iter)->visual).SetOnStage( parentActor ); } else { - (*iter)->visual.SetOffStage( parentActor ); // No need to call if control not staged. + Toolkit::GetImplementation((*iter)->visual).SetOffStage( parentActor ); // No need to call if control not staged. } } } @@ -773,22 +840,69 @@ bool Control::IsVisualEnabled( Property::Index index ) const return false; } -Actor Control::GetPlacementActor( Property::Index index ) const +Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle ) { - RegisteredVisualContainer::Iterator iter; - if ( FindVisual( index, mImpl->mVisuals, iter ) ) + Dali::Animation transition; + const Internal::TransitionData& transitionData = Toolkit::GetImplementation( handle ); + + if( transitionData.Count() > 0 ) { - if( (*iter)->placementActor ) + // Setup a Transition from TransitionData. + TransitionData::Iterator end = transitionData.End(); + for( TransitionData::Iterator iter = transitionData.Begin() ; + iter != end; ++iter ) { - return (*iter)->placementActor; - } - else - { - return Self(); + TransitionData::Animator* animator = (*iter); + HandleIndex handleIndex; + + // Attempt to find the object name as a child actor + Actor child = Self().FindChildByName( animator->objectName ); + if( child ) + { + Property::Index propertyIndex = child.GetPropertyIndex( animator->propertyKey ); + handleIndex = HandleIndex( child, propertyIndex ); + } + else + { + handleIndex = GetVisualProperty( *this, mImpl->mVisuals, + animator->objectName, + animator->propertyKey ); + } + + if( handleIndex.handle && handleIndex.index != Property::INVALID_INDEX ) + { + if( animator->animate == false ) + { + if( animator->targetValue.GetType() != Property::NONE ) + { + handleIndex.handle.SetProperty( handleIndex.index, animator->targetValue ); + } + } + else + { + if( animator->initialValue.GetType() != Property::NONE ) + { + handleIndex.handle.SetProperty( handleIndex.index, animator->initialValue ); + } + + if( ! transition ) + { + // Create an animation with a default .1 second duration - the animators + // will automatically force it to the 'right' duration. + transition = Dali::Animation::New( 0.1f ); + } + + transition.AnimateTo( Property( handleIndex.handle, handleIndex.index ), + animator->targetValue, + animator->alphaFunction, + TimePeriod( animator->timePeriodDelay, + animator->timePeriodDuration ) ); + } + } } } - return Actor(); + return transition; } bool Control::OnAccessibilityActivated() @@ -979,18 +1093,11 @@ void Control::OnStageConnection( int depth ) { for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + // Check whether the visual is empty and enabled if( (*iter)->visual && (*iter)->enabled ) { - if( (*iter)->placementActor ) - { - (*iter)->visual.SetOnStage( (*iter)->placementActor ); - } - else - { - Actor self( Self() ); - (*iter)->visual.SetOnStage( self ); - } + Actor self( Self() ); + Toolkit::GetImplementation((*iter)->visual).SetOnStage( self ); } } } @@ -999,18 +1106,11 @@ void Control::OnStageDisconnection() { for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + // Check whether the visual is empty if( (*iter)->visual ) { - if( (*iter)->placementActor ) - { - (*iter)->visual.SetOffStage( (*iter)->placementActor ); - } - else - { - Actor self( Self() ); - (*iter)->visual.SetOffStage( self ); - } + Actor self( Self() ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); } } }