X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcontrol%2Fcontrol-data-impl.cpp;h=a6d30d9e528cca45ea707d4fa74a95a5d2d0b5a2;hp=38c9a57d4037566c0b7fa22f57230513035c10b3;hb=1498b458e65cce375898c232cfa87c831b1f1c6b;hpb=24ea337df1049251ab2e47c556edc6e8458f9c93 diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp old mode 100644 new mode 100755 index 38c9a57..a6d30d9 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -19,22 +19,25 @@ #include "control-data-impl.h" // EXTERNAL INCLUDES -#include +#include #include +#include #include #include #include #include #include +#include // INTERNAL INCLUDES #include +#include +#include #include +#include +#include #include -#include -#include #include -#include namespace Dali { @@ -82,10 +85,10 @@ void Remove( DictionaryKeys& keys, const std::string& name ) } } -Toolkit::DevelVisual::Type GetVisualTypeFromMap( const Property::Map& map ) +Toolkit::Visual::Type GetVisualTypeFromMap( const Property::Map& map ) { - Property::Value* typeValue = map.Find( Toolkit::DevelVisual::Property::TYPE, VISUAL_TYPE ); - Toolkit::DevelVisual::Type type = Toolkit::DevelVisual::IMAGE; + Property::Value* typeValue = map.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE ); + Toolkit::Visual::Type type = Toolkit::Visual::IMAGE; if( typeValue ) { Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, type ); @@ -93,6 +96,21 @@ Toolkit::DevelVisual::Type GetVisualTypeFromMap( const Property::Map& map ) return type; } +/** + * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter + */ +bool FindVisual( Property::Index targetIndex, const RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter ) +{ + for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) + { + if ( (*iter)->index == targetIndex ) + { + return true; + } + } + return false; +} + void FindChangableVisuals( Dictionary& stateVisualsToAdd, Dictionary& stateVisualsToChange, DictionaryKeys& stateVisualsToRemove) @@ -113,6 +131,38 @@ void FindChangableVisuals( Dictionary& stateVisualsToAdd, } } +Toolkit::Visual::Base GetVisualByName( + const RegisteredVisualContainer& visuals, + const std::string& visualName ) +{ + Toolkit::Visual::Base visualHandle; + + RegisteredVisualContainer::Iterator iter; + for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) + { + Toolkit::Visual::Base visual = (*iter)->visual; + if( visual && visual.GetName() == visualName ) + { + visualHandle = visual; + break; + } + } + return visualHandle; +} + +/** + * Move visual from source to destination container + */ +void MoveVisual( RegisteredVisualContainer::Iterator sourceIter, RegisteredVisualContainer& source, RegisteredVisualContainer& destination ) +{ + Toolkit::Visual::Base visual = (*sourceIter)->visual; + if( visual ) + { + RegisteredVisual* rv = source.Release( sourceIter ); + destination.PushBack( rv ); + } +} + /** * Performs actions as requested using the action name. * @param[in] object The object on which to perform the action. @@ -225,7 +275,23 @@ TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &Do DALI_TYPE_REGISTRATION_END() - +/** + * @brief Iterate through given container and setOffStage any visual found + * + * @param[in] container Container of visuals + * @param[in] parent Parent actor to remove visuals from + */ +void SetVisualsOffStage( const RegisteredVisualContainer& container, Actor parent ) +{ + for( auto iter = container.Begin(), end = container.End() ; iter!= end; iter++) + { + if( (*iter)->visual ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::SetOffStage Setting visual(%d) off stage\n", (*iter)->index ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( parent ); + } + } +} } // unnamed namespace @@ -236,20 +302,22 @@ const PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "backgro const PropertyRegistration Control::Impl::PROPERTY_3( typeRegistration, "backgroundImage", Toolkit::Control::Property::BACKGROUND_IMAGE, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); const PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "keyInputFocus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); const PropertyRegistration Control::Impl::PROPERTY_5( typeRegistration, "background", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -const PropertyRegistration Control::Impl::PROPERTY_6( typeRegistration, "tooltip", Toolkit::DevelControl::Property::TOOLTIP, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -const PropertyRegistration Control::Impl::PROPERTY_7( typeRegistration, "state", Toolkit::DevelControl::Property::STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -const PropertyRegistration Control::Impl::PROPERTY_8( typeRegistration, "subState", Toolkit::DevelControl::Property::SUB_STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -const PropertyRegistration Control::Impl::PROPERTY_9( typeRegistration, "leftFocusableActorId", Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -const PropertyRegistration Control::Impl::PROPERTY_10( typeRegistration, "rightFocusableActorId", Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID,Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -const PropertyRegistration Control::Impl::PROPERTY_11( typeRegistration, "upFocusableActorId", Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -const PropertyRegistration Control::Impl::PROPERTY_12( typeRegistration, "downFocusableActorId", Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); - +const PropertyRegistration Control::Impl::PROPERTY_6( typeRegistration, "margin", Toolkit::Control::Property::MARGIN, Property::EXTENTS, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_7( typeRegistration, "padding", Toolkit::Control::Property::PADDING, Property::EXTENTS, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_8( typeRegistration, "tooltip", Toolkit::DevelControl::Property::TOOLTIP, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_9( typeRegistration, "state", Toolkit::DevelControl::Property::STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_10( typeRegistration, "subState", Toolkit::DevelControl::Property::SUB_STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_11( typeRegistration, "leftFocusableActorId", Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_12( typeRegistration, "rightFocusableActorId", Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID,Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_13( typeRegistration, "upFocusableActorId", Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_14( typeRegistration, "downFocusableActorId", Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); Control::Impl::Impl( Control& controlImpl ) : mControlImpl( controlImpl ), mState( Toolkit::DevelControl::NORMAL ), mSubStateName(""), + mLayout( NULL ), mLeftFocusableActorId( -1 ), mRightFocusableActorId( -1 ), mUpFocusableActorId( -1 ), @@ -257,16 +325,22 @@ Control::Impl::Impl( Control& controlImpl ) mStyleName(""), mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale( NULL ), + mMargin( 0, 0, 0, 0 ), + mPadding( 0, 0, 0, 0 ), mKeyEventSignal(), + mKeyInputFocusGainedSignal(), + mKeyInputFocusLostSignal(), + mResourceReadySignal(), mPinchGestureDetector(), mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), + mTooltip( NULL ), + mInputMethodContext(), mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mIsKeyboardNavigationSupported( false ), mIsKeyboardFocusGroup( false ) { - } Control::Impl::~Impl() @@ -285,28 +359,6 @@ const Control::Impl& Control::Impl::Get( const Internal::Control& internalContro return *internalControl.mImpl; } - - - -Toolkit::Visual::Base Control::Impl::GetVisualByName( - RegisteredVisualContainer& visuals, - const std::string& visualName ) -{ - Toolkit::Visual::Base visualHandle; - - RegisteredVisualContainer::Iterator iter; - for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) - { - Toolkit::Visual::Base visual = (*iter)->visual; - if( visual && visual.GetName() == visualName ) - { - visualHandle = visual; - break; - } - } - return visualHandle; -} - // Gesture Detection Methods void Control::Impl::PinchDetected(Actor actor, const PinchGesture& pinch) { @@ -328,47 +380,249 @@ void Control::Impl::LongPressDetected(Actor actor, const LongPressGesture& longP mControlImpl.OnLongPress(longPress); } -// Called by a Visual when it's resource is ready -void Control::Impl::ResourceReady( Visual::Base& object) +void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ) +{ + RegisterVisual( index, visual, VisualState::ENABLED, DepthIndexValue::NOT_SET ); +} + +void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, int depthIndex ) +{ + RegisterVisual( index, visual, VisualState::ENABLED, DepthIndexValue::SET, depthIndex ); +} + +void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ) +{ + RegisterVisual( index, visual, ( enabled ? VisualState::ENABLED : VisualState::DISABLED ), DepthIndexValue::NOT_SET ); +} + +void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex ) { + RegisterVisual( index, visual, ( enabled ? VisualState::ENABLED : VisualState::DISABLED ), DepthIndexValue::SET, depthIndex ); +} - // go through and check if all the visuals are ready, if they are emit a signal - for ( RegisteredVisualContainer::ConstIterator visualIter = mVisuals.Begin(); - visualIter != mVisuals.End(); ++visualIter ) +void Control::Impl::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, VisualState::Type enabled, DepthIndexValue::Type depthIndexValueSet, int depthIndex ) +{ + DALI_LOG_INFO( gLogFilter, Debug::Concise, "RegisterVisual:%d \n", index ); + + bool visualReplaced ( false ); + Actor self = mControlImpl.Self(); + + // Set the depth index, if not set by caller this will be either the current visual depth, max depth of all visuals + // or zero. + int requiredDepthIndex = visual.GetDepthIndex(); + + if( depthIndexValueSet == DepthIndexValue::SET ) { - const Toolkit::Visual::Base visual = (*visualIter)->visual; - const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + requiredDepthIndex = depthIndex; + } - // one of the visuals is not ready - if( !visualImpl.IsResourceReady() ) + // Visual replacement, existing visual should only be removed from stage when replacement ready. + if( !mVisuals.Empty() ) + { + RegisteredVisualContainer::Iterator registeredVisualsiter; + // Check if visual (index) is already registered, this is the current visual. + if( FindVisual( index, mVisuals, registeredVisualsiter ) ) { - return; + Toolkit::Visual::Base& currentRegisteredVisual = (*registeredVisualsiter)->visual; + if( currentRegisteredVisual ) + { + // Store current visual depth index as may need to set the replacement visual to same depth + const int currentDepthIndex = (*registeredVisualsiter)->visual.GetDepthIndex(); + + // No longer required to know if the replaced visual's resources are ready + StopObservingVisual( currentRegisteredVisual ); + + // If control staged and visual enabled then visuals will be swapped once ready + if( self.OnStage() && enabled ) + { + // Check if visual is currently in the process of being replaced ( is in removal container ) + RegisteredVisualContainer::Iterator visualQueuedForRemoval; + if ( FindVisual( index, mRemoveVisuals, visualQueuedForRemoval ) ) + { + // Visual with same index is already in removal container so current visual pending + // Only the the last requested visual will be displayed so remove current visual which is staged but not ready. + Toolkit::GetImplementation( currentRegisteredVisual ).SetOffStage( self ); + mVisuals.Erase( registeredVisualsiter ); + } + else + { + // current visual not already in removal container so add now. + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "RegisterVisual Move current registered visual to removal Queue: %d \n", index ); + MoveVisual( registeredVisualsiter, mVisuals, mRemoveVisuals ); + } + } + else + { + // Control not staged or visual disabled so can just erase from registered visuals and new visual will be added later. + mVisuals.Erase( registeredVisualsiter ); + } + + // If we've not set the depth-index value and the new visual does not have a depth index applied to it, then use the previously set depth-index for this index + if( ( depthIndexValueSet == DepthIndexValue::NOT_SET ) && + ( visual.GetDepthIndex() == 0 ) ) + { + requiredDepthIndex = currentDepthIndex; + } + } + + visualReplaced = true; + } + } + + // If not set, set the name of the visual to the same name as the control's property. + // ( If the control has been type registered ) + if( visual.GetName().empty() ) + { + try + { + std::string visualName = self.GetPropertyName( index ); + if( !visualName.empty() ) + { + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Setting visual name for property %d to %s\n", + index, visualName.c_str() ); + visual.SetName( visualName ); + } + } + catch( Dali::DaliException e ) + { + DALI_LOG_WARNING( "Attempting to register visual without a registered property, index: %d\n", index ); + } + } + + if( !visualReplaced ) // New registration entry + { + // If we've not set the depth-index value, we have more than one visual and the visual does not have a depth index, then set it to be the highest + if( ( depthIndexValueSet == DepthIndexValue::NOT_SET ) && + ( mVisuals.Size() > 0 ) && + ( visual.GetDepthIndex() == 0 ) ) + { + int maxDepthIndex = std::numeric_limits< int >::min(); + + RegisteredVisualContainer::ConstIterator iter; + const RegisteredVisualContainer::ConstIterator endIter = mVisuals.End(); + for ( iter = mVisuals.Begin(); iter != endIter; iter++ ) + { + const int visualDepthIndex = (*iter)->visual.GetDepthIndex(); + if ( visualDepthIndex > maxDepthIndex ) + { + maxDepthIndex = visualDepthIndex; + } + } + ++maxDepthIndex; // Add one to the current maximum depth index so that our added visual appears on top + requiredDepthIndex = std::max( 0, maxDepthIndex ); // Start at zero if maxDepth index belongs to a background + } + } + + if( visual ) + { + // Set determined depth index + visual.SetDepthIndex( requiredDepthIndex ); + + // Monitor when the visual resources are ready + StartObservingVisual( visual ); + + DALI_LOG_INFO( gLogFilter, Debug::Concise, "New Visual registration index[%d] depth[%d]\n", index, requiredDepthIndex ); + RegisteredVisual* newRegisteredVisual = new RegisteredVisual( index, visual, + ( enabled == VisualState::ENABLED ? true : false ), + ( visualReplaced && enabled ) ) ; + mVisuals.PushBack( newRegisteredVisual ); + + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + // Put on stage if enabled and the control is already on the stage + if( ( enabled == VisualState::ENABLED ) && self.OnStage() ) + { + visualImpl.SetOnStage( self ); + } + else if( visualImpl.IsResourceReady() ) // When not being staged, check if visual already 'ResourceReady' before it was Registered. ( Resource may have been loaded already ) + { + ResourceReady( visualImpl ); } + } - // all the visuals are ready - Dali::Toolkit::Control handle( mControlImpl.GetOwner() ); - mResourceReadySignal.Emit( handle ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::RegisterVisual() Registered %s(%d), enabled:%s\n", visual.GetName().c_str(), index, enabled?"true":"false" ); +} + +void Control::Impl::UnregisterVisual( Property::Index index ) +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mVisuals, iter ) ) + { + // stop observing visual + StopObservingVisual( (*iter)->visual ); + + Actor self( mControlImpl.Self() ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); + (*iter)->visual.Reset(); + mVisuals.Erase( iter ); + } + if( FindVisual( index, mRemoveVisuals, iter ) ) + { + Actor self( mControlImpl.Self() ); + Toolkit::GetImplementation( (*iter)->visual ).SetOffStage( self ); + (*iter)->pending = false; + (*iter)->visual.Reset(); + mRemoveVisuals.Erase( iter ); + } } -bool Control::Impl::IsResourceReady() const +Toolkit::Visual::Base Control::Impl::GetVisual( Property::Index index ) const { - // go through and check all the visuals are ready - for ( RegisteredVisualContainer::ConstIterator visualIter = mVisuals.Begin(); - visualIter != mVisuals.End(); ++visualIter ) - { - const Toolkit::Visual::Base visual = (*visualIter)->visual; - const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); - - // one of the visuals is not ready - if( !visualImpl.IsResourceReady() ) - { - return false; - } - } - return true; + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mVisuals, iter ) ) + { + return (*iter)->visual; + } + + return Toolkit::Visual::Base(); } + +void Control::Impl::EnableVisual( Property::Index index, bool enable ) +{ + DALI_LOG_INFO( gLogFilter, Debug::General, "Control::EnableVisual(%d, %s)\n", index, enable?"T":"F"); + + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mVisuals, iter ) ) + { + if ( (*iter)->enabled == enable ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual %s(%d) already %s\n", (*iter)->visual.GetName().c_str(), index, enable?"enabled":"disabled"); + return; + } + + (*iter)->enabled = enable; + Actor parentActor = mControlImpl.Self(); + if ( mControlImpl.Self().OnStage() ) // If control not on Stage then Visual will be added when StageConnection is called. + { + if ( enable ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) on stage \n", (*iter)->visual.GetName().c_str(), index ); + Toolkit::GetImplementation((*iter)->visual).SetOnStage( parentActor ); + } + else + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) off stage \n", (*iter)->visual.GetName().c_str(), index ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( parentActor ); // No need to call if control not staged. + } + } + } + else + { + DALI_LOG_WARNING( "Control::EnableVisual(%d, %s) FAILED - NO SUCH VISUAL\n", index, enable?"T":"F" ); + } +} + +bool Control::Impl::IsVisualEnabled( Property::Index index ) const +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mVisuals, iter ) ) + { + return (*iter)->enabled; + } + return false; +} + void Control::Impl::StopObservingVisual( Toolkit::Visual::Base& visual ) { Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); @@ -385,14 +639,175 @@ void Control::Impl::StartObservingVisual( Toolkit::Visual::Base& visual) visualImpl.AddResourceObserver( *this ); } -// Properties +// Called by a Visual when it's resource is ready +void Control::Impl::ResourceReady( Visual::Base& object) +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::Impl::ResourceReady() replacements pending[%d]\n", mRemoveVisuals.Count() ); + + Actor self = mControlImpl.Self(); + + // A resource is ready, find resource in the registered visuals container and get its index + for( auto registeredIter = mVisuals.Begin(), end = mVisuals.End(); registeredIter != end; ++registeredIter ) + { + Internal::Visual::Base& registeredVisualImpl = Toolkit::GetImplementation( (*registeredIter)->visual ); + + if( &object == ®isteredVisualImpl ) + { + RegisteredVisualContainer::Iterator visualToRemoveIter; + // Find visual with the same index in the removal container + // Set if off stage as it's replacement is now ready. + // Remove if from removal list as now removed from stage. + // Set Pending flag on the ready visual to false as now ready. + if( FindVisual( (*registeredIter)->index, mRemoveVisuals, visualToRemoveIter ) ) + { + (*registeredIter)->pending = false; + Toolkit::GetImplementation( (*visualToRemoveIter)->visual ).SetOffStage( self ); + mRemoveVisuals.Erase( visualToRemoveIter ); + } + break; + } + } + + // A visual is ready so control may need relayouting if staged + if ( self.OnStage() ) + { + mControlImpl.RelayoutRequest(); + } + + // Emit signal if all enabled visuals registered by the control are ready. + if( IsResourceReady() ) + { + Dali::Toolkit::Control handle( mControlImpl.GetOwner() ); + mResourceReadySignal.Emit( handle ); + } +} + +bool Control::Impl::IsResourceReady() const +{ + // Iterate through and check all the enabled visuals are ready + for( auto visualIter = mVisuals.Begin(); + visualIter != mVisuals.End(); ++visualIter ) + { + const Toolkit::Visual::Base visual = (*visualIter)->visual; + const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + + // one of the enabled visuals is not ready + if( !visualImpl.IsResourceReady() && (*visualIter)->enabled ) + { + return false; + } + } + return true; +} + +Toolkit::Visual::ResourceStatus Control::Impl::GetVisualResourceStatus( Property::Index index ) const +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mVisuals, iter ) ) + { + const Toolkit::Visual::Base visual = (*iter)->visual; + const Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + return visualImpl.GetResourceStatus( ); + } + + return Toolkit::Visual::ResourceStatus::PREPARING; +} + + + +void Control::Impl::AddTransitions( Dali::Animation& animation, + const Toolkit::TransitionData& handle, + bool createAnimation ) +{ + // Setup a Transition from TransitionData. + const Internal::TransitionData& transitionData = Toolkit::GetImplementation( handle ); + TransitionData::Iterator end = transitionData.End(); + for( TransitionData::Iterator iter = transitionData.Begin() ; + iter != end; ++iter ) + { + TransitionData::Animator* animator = (*iter); + + Toolkit::Visual::Base visual = GetVisualByName( mVisuals, animator->objectName ); + + if( visual ) + { +#if defined(DEBUG_ENABLED) + Dali::TypeInfo typeInfo; + ControlWrapper* controlWrapperImpl = dynamic_cast(&mControlImpl); + if( controlWrapperImpl ) + { + typeInfo = controlWrapperImpl->GetTypeInfo(); + } + + DALI_LOG_INFO( gLogFilter, Debug::Concise, "CreateTransition: Found %s visual for %s\n", + visual.GetName().c_str(), typeInfo?typeInfo.GetName().c_str():"Unknown" ); +#endif + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.AnimateProperty( animation, *animator ); + } + else + { + DALI_LOG_INFO( gLogFilter, Debug::Concise, "CreateTransition: Could not find visual. Trying actors"); + // Otherwise, try any actor children of control (Including the control) + Actor child = mControlImpl.Self().FindChildByName( animator->objectName ); + if( child ) + { + Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey ); + if( propertyIndex != Property::INVALID_INDEX ) + { + if( animator->animate == false ) + { + if( animator->targetValue.GetType() != Property::NONE ) + { + child.SetProperty( propertyIndex, animator->targetValue ); + } + } + else // animate the property + { + if( animator->initialValue.GetType() != Property::NONE ) + { + child.SetProperty( propertyIndex, animator->initialValue ); + } + + if( createAnimation && !animation ) + { + animation = Dali::Animation::New( 0.1f ); + } + + animation.AnimateTo( Property( child, propertyIndex ), + animator->targetValue, + animator->alphaFunction, + TimePeriod( animator->timePeriodDelay, + animator->timePeriodDuration ) ); + } + } + } + } + } +} + +Dali::Animation Control::Impl::CreateTransition( const Toolkit::TransitionData& transitionData ) +{ + Dali::Animation transition; + + if( transitionData.Count() > 0 ) + { + AddTransitions( transition, transitionData, true ); + } + return transition; +} + + + +void Control::Impl::DoAction( Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes ) +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( visualIndex, mVisuals, iter ) ) + { + Toolkit::GetImplementation((*iter)->visual).DoAction( actionId, attributes ); + } +} -/** - * Called when a property of an object of this type is set. - * @param[in] object The object whose property is set. - * @param[in] index The property index. - * @param[in] value The new property value. - */ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) { Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) ); @@ -537,8 +952,7 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( url, ImageDimensions() ); if( visual ) { - controlImpl.RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual ); - visual.SetDepthIndex( DepthIndex::BACKGROUND ); + controlImpl.mImpl->RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual, DepthIndex::BACKGROUND ); } } else if( value.Get( color ) ) @@ -553,6 +967,26 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons break; } + case Toolkit::Control::Property::MARGIN: + { + Extents margin; + if( value.Get( margin ) ) + { + controlImpl.mImpl->SetMargin( margin ); + } + break; + } + + case Toolkit::Control::Property::PADDING: + { + Extents padding; + if( value.Get( padding ) ) + { + controlImpl.mImpl->SetPadding( padding ); + } + break; + } + case Toolkit::DevelControl::Property::TOOLTIP: { TooltipPtr& tooltipPtr = controlImpl.mImpl->mTooltip; @@ -561,17 +995,13 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons tooltipPtr = Tooltip::New( control ); } tooltipPtr->SetProperties( value ); + break; } + } } } -/** - * Called to retrieve a property of an object of this type. - * @param[in] object The object whose property is to be retrieved. - * @param[in] index The property index. - * @return The current value of the property. - */ Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index index ) { Property::Value value; @@ -637,7 +1067,7 @@ Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index { DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); Property::Map map; - Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND ); + Toolkit::Visual::Base visual = controlImpl.mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND ); if( visual ) { visual.CreatePropertyMap( map ); @@ -655,7 +1085,7 @@ Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index case Toolkit::Control::Property::BACKGROUND: { Property::Map map; - Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND ); + Toolkit::Visual::Base visual = controlImpl.mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND ); if( visual ) { visual.CreatePropertyMap( map ); @@ -665,6 +1095,18 @@ Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index break; } + case Toolkit::Control::Property::MARGIN: + { + value = controlImpl.mImpl->GetMargin(); + break; + } + + case Toolkit::Control::Property::PADDING: + { + value = controlImpl.mImpl->GetPadding(); + break; + } + case Toolkit::DevelControl::Property::TOOLTIP: { Property::Map map; @@ -675,7 +1117,6 @@ Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index value = map; break; } - } } @@ -725,12 +1166,6 @@ void Control::Impl::RemoveVisuals( RegisteredVisualContainer& visuals, Dictionar } } - -/** - * Go through the list of visuals that are common to both states. - * If they are different types, or are both image types with different - * URLs, then the existing visual needs moving and the new visual creating - */ void Control::Impl::RecreateChangedVisuals( Dictionary& stateVisualsToChange, Dictionary& instancedProperties ) { @@ -750,8 +1185,8 @@ void Control::Impl::RecreateChangedVisuals( Dictionary& stateVisu Property::Map fromMap; visual.CreatePropertyMap( fromMap ); - Toolkit::DevelVisual::Type fromType = GetVisualTypeFromMap( fromMap ); - Toolkit::DevelVisual::Type toType = GetVisualTypeFromMap( toMap ); + Toolkit::Visual::Type fromType = GetVisualTypeFromMap( fromMap ); + Toolkit::Visual::Type toType = GetVisualTypeFromMap( toMap ); if( fromType != toType ) { @@ -759,8 +1194,8 @@ void Control::Impl::RecreateChangedVisuals( Dictionary& stateVisu } else { - if( fromType == Toolkit::DevelVisual::IMAGE || fromType == Toolkit::DevelVisual::N_PATCH - || fromType == Toolkit::DevelVisual::SVG || fromType == Toolkit::DevelVisual::ANIMATED_IMAGE ) + if( fromType == Toolkit::Visual::IMAGE || fromType == Toolkit::Visual::N_PATCH + || fromType == Toolkit::Visual::SVG || fromType == Toolkit::Visual::ANIMATED_IMAGE ) { Property::Value* fromUrl = fromMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); Property::Value* toUrl = toMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); @@ -927,6 +1362,95 @@ void Control::Impl::SetSubState( const std::string& subStateName, bool withTrans } } +void Control::Impl::OnStageDisconnection() +{ + Actor self = mControlImpl.Self(); + + // Any visuals set for replacement but not yet ready should still be registered. + // Reason: If a request was made to register a new visual but the control removed from stage before visual was ready + // then when this control appears back on stage it should use that new visual. + + // Iterate through all registered visuals and set off stage + SetVisualsOffStage( mVisuals, self ); + + // Visuals pending replacement can now be taken out of the removal list and set off stage + // Iterate through all replacement visuals and add to a move queue then set off stage + for( auto removalIter = mRemoveVisuals.Begin(), end = mRemoveVisuals.End(); removalIter != end; removalIter++ ) + { + Toolkit::GetImplementation((*removalIter)->visual).SetOffStage( self ); + } + + for( auto replacedIter = mVisuals.Begin(), end = mVisuals.End(); replacedIter != end; replacedIter++ ) + { + (*replacedIter)->pending = false; + } + + mRemoveVisuals.Clear(); +} + +void Control::Impl::SetMargin( Extents margin ) +{ + mControlImpl.mImpl->mMargin = margin; +} + +Extents Control::Impl::GetMargin() const +{ + return mControlImpl.mImpl->mMargin; +} + +void Control::Impl::SetPadding( Extents padding ) +{ + mControlImpl.mImpl->mPadding = padding; +} + +Extents Control::Impl::GetPadding() const +{ + return mControlImpl.mImpl->mPadding; +} + +void Control::Impl::SetInputMethodContext( InputMethodContext& inputMethodContext ) +{ + mInputMethodContext = inputMethodContext; +} + +bool Control::Impl::FilterKeyEvent( const KeyEvent& event ) +{ + bool consumed ( false ); + + if ( mInputMethodContext ) + { + consumed = mInputMethodContext.FilterEventKey( event ); + } + return consumed; +} + +Toolkit::Internal::LayoutItemPtr Control::Impl::GetLayout() const +{ + return mLayout; +} + +void Control::Impl::SetLayout( Toolkit::Internal::LayoutItem& layout ) +{ + if( mLayout ) + { + mLayout->Unparent(); + mLayout.Reset(); + } + mLayout = &layout; + + auto controlHandle = Toolkit::Control::DownCast( mControlImpl.Self() ); // Get a handle of this control implementation without copying internals. + mLayout->Initialize( controlHandle, controlHandle.GetTypeName() ); // LayoutGroup takes ownership of existing children +} + +void Control::Impl::RemoveLayout() +{ + if( mLayout ) + { + mLayout->Unparent(); + mLayout.Reset(); + } +} + } // namespace Internal } // namespace Toolkit