#include <dali-toolkit/internal/styling/style-manager-impl.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/internal/visuals/transition-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#include <dali-toolkit/devel-api/align-enums.h>
#include <dali-toolkit/internal/controls/tooltip/tooltip.h>
Toolkit::Visual::Base visual;
bool enabled;
- 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 )
+ RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, bool aEnabled)
+ : index(aIndex), visual(aVisual), enabled(aEnabled)
{
}
};
-
typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisualContainer;
/**
return false;
}
-HandleIndex GetVisualProperty(
- Internal::Control& controlImpl,
+Toolkit::Visual::Base GetVisualByName(
RegisteredVisualContainer& visuals,
- const std::string& visualName,
- Property::Key propertyKey )
+ const std::string& visualName )
{
-#if defined(DEBUG_ENABLED)
- std::ostringstream oss;
- oss << "Control::GetVisualProperty(" << visualName << ", " << propertyKey << ")" << std::endl;
- DALI_LOG_INFO( gLogFilter, Debug::General, oss.str().c_str() );
-#endif
+ Toolkit::Visual::Base visualHandle;
- // Find visualName in the control
RegisteredVisualContainer::Iterator iter;
for ( iter = visuals.Begin(); iter != visuals.End(); iter++ )
{
Toolkit::Visual::Base visual = (*iter)->visual;
if( visual && visual.GetName() == visualName )
{
- Internal::Visual::Base& visualImpl = GetImplementation(visual);
- Renderer renderer = visualImpl.GetRenderer();
- if( renderer )
- {
- Property::Index index = DevelHandle::GetPropertyIndex( renderer, propertyKey );
- if( index != Property::INVALID_INDEX )
- {
- return HandleIndex( renderer, index );
- }
- }
+ visualHandle = visual;
+ break;
}
}
-
- std::ostringstream noRenderers;
- noRenderers << propertyKey;
- DALI_LOG_WARNING( "Control::GetVisualProperty(%s, %s) No renderers\n", visualName.c_str(), noRenderers.str().c_str() );
- Handle handle;
- return HandleIndex( handle, Property::INVALID_INDEX );
-}
-
-void SetDefaultTransform( Property::Map& propertyMap )
-{
- propertyMap.Clear();
- propertyMap
- .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 );
+ return visualHandle;
}
/**
{
Toolkit::GetImplementation(visual).SetOnStage( self );
}
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::RegisterVisual number of registered visuals(%d)\n", mImpl->mVisuals.Size() );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::RegisterVisual() Registered %s(%d), enabled:%s\n", visual.GetName().c_str(), index, enabled?"T":"F" );
}
void Control::UnregisterVisual( Property::Index index )
{
if ( (*iter)->enabled == enable )
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual Already enabled set (%s) \n", enable?"enabled":"disabled");
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual %s(%d) already %s\n", (*iter)->visual.GetName().c_str(), index, enable?"enabled":"disabled");
return;
}
{
if ( enable )
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting Visual(%d) on stage \n", index );
+ 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 Visual(%d) off stage \n", index );
+ 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.
}
}
iter != end; ++iter )
{
TransitionData::Animator* animator = (*iter);
- HandleIndex handleIndex;
- // Attempt to find the object name as a child actor
- Actor child = Self().FindChildByName( animator->objectName );
- if( child )
+ Toolkit::Visual::Base visual = GetVisualByName( mImpl->mVisuals, animator->objectName );
+
+ if( visual )
{
- Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey );
- handleIndex = HandleIndex( child, propertyIndex );
+ Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual );
+ visualImpl.AnimateProperty( transition, *animator );
}
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
+ // Otherwise, try any actor children of control (Including the control)
+ Actor child = Self().FindChildByName( animator->objectName );
+ if( child )
{
- if( animator->initialValue.GetType() != Property::NONE )
+ Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey );
+ if( propertyIndex != Property::INVALID_INDEX )
{
- 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 );
+ 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( ! transition )
+ {
+ transition = Dali::Animation::New( 0.1f );
+ }
+
+ transition.AnimateTo( Property( child, propertyIndex ),
+ animator->targetValue,
+ animator->alphaFunction,
+ TimePeriod( animator->timePeriodDelay,
+ animator->timePeriodDuration ) );
+ }
}
-
- transition.AnimateTo( Property( handleIndex.handle, handleIndex.index ),
- animator->targetValue,
- animator->alphaFunction,
- TimePeriod( animator->timePeriodDelay,
- animator->timePeriodDuration ) );
}
}
}
if( visual )
{
Vector2 size( targetSize );
- Property::Map transformMap;
- SetDefaultTransform( transformMap );
- visual.SetTransformAndSize( transformMap, size );
+ visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform
}
}
Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND );
if( visual )
{
- Vector2 controlSize( size );
- Property::Map transformMap;
- SetDefaultTransform( transformMap );
- visual.SetTransformAndSize( transformMap, controlSize );
+ visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform
}
}