#include <cstring> // for strcmp
#include <limits>
#include <stack>
+#include <typeinfo>
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/rendering/renderer.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
#include <dali/devel-api/common/owner-container.h>
+#include <dali/devel-api/object/handle-devel.h>
#include <dali/devel-api/scripting/scripting.h>
#include <dali/integration-api/debug.h>
#include <dali-toolkit/public-api/styling/style-manager.h>
#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
#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/devel-api/align-enums.h>
namespace Dali
{
{
#if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New( Debug::General, false, "LOG_CONTROL_VISUALS");
+Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_CONTROL_VISUALS");
#endif
/**
{
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 VisualProperty
+struct HandleIndex
{
Handle handle; ///< a handle to the target object
Property::Index index; ///< The index of a property provided by the referenced object
- VisualProperty( )
+ HandleIndex( )
: handle(),
index( Property::INVALID_INDEX )
{
}
- VisualProperty( Handle& handle, Property::Index index )
+ HandleIndex( Handle& handle, Property::Index index )
: handle( handle ),
index( index )
{
return false;
}
-VisualProperty GetVisualProperty(
+HandleIndex GetVisualProperty(
Internal::Control& controlImpl,
RegisteredVisualContainer& visuals,
const std::string& visualName,
RegisteredVisualContainer::Iterator iter;
for ( iter = visuals.Begin(); iter != visuals.End(); iter++ )
{
- if ( (*iter)->visual.GetName() == visualName )
+ Toolkit::Visual::Base visual = (*iter)->visual;
+ if( visual && visual.GetName() == visualName )
{
- break;
- }
- }
-
- // Does either it's renderer or placement actor have an associated property?
- if( iter != visuals.End() )
- {
- Actor placementActor = (*iter)->placementActor;
- if( !placementActor )
- {
- placementActor = controlImpl.Self();
- }
-
- Property::Index index = placementActor.GetPropertyIndex( propertyKey );
- if( index != Property::INVALID_INDEX )
- {
- // It's a placement actor property:
- return VisualProperty( placementActor, index );
- }
- else
- {
- // Check if it is a renderer property:
- if( placementActor.GetRendererCount() > 0 )
+ Internal::Visual::Base& visualImpl = GetImplementation(visual);
+ Renderer renderer = visualImpl.GetRenderer();
+ if( renderer )
{
- // @todo Need to use correct renderer index when placement actors
- // are removed
- Renderer renderer = placementActor.GetRendererAt(0);
- Property::Index index = renderer.GetPropertyIndex( propertyKey );
+ Property::Index index = DevelHandle::GetPropertyIndex( renderer, propertyKey );
if( index != Property::INVALID_INDEX )
{
- // It's a renderer property:
- return VisualProperty( renderer, index );
+ return HandleIndex( renderer, index );
}
}
- else
- {
- std::ostringstream oss;
- oss << propertyKey;
- DALI_LOG_WARNING( "Control::GetVisualProperty(%s, %s) No renderers\n", visualName.c_str(), oss.str().c_str() );
- }
}
}
+
+ 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 VisualProperty( handle, Property::INVALID_INDEX );
+ 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 );
+}
/**
* Creates control through type registry
Impl(Control& controlImpl)
: mControlImpl( controlImpl ),
mStyleName(""),
- mBackgroundVisual(),
mBackgroundColor(Color::TRANSPARENT),
mStartingPinchScale( NULL ),
mKeyEventSignal(),
}
else
{
- // An empty map means the background is no longer required
+ // An empty image means the background is no longer required
controlImpl.ClearBackground();
}
break;
case Toolkit::Control::Property::BACKGROUND:
{
+ std::string url;
const Property::Map* map = value.GetMap();
- if( map )
+ if( map && !map->Empty() )
{
controlImpl.SetBackground( *map );
}
+ else if( value.Get( url ) )
+ {
+ // don't know the size to load
+ Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( url, ImageDimensions() );
+ if( visual )
+ {
+ controlImpl.RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual );
+ visual.SetDepthIndex( DepthIndex::BACKGROUND );
+ }
+ }
else
{
- // The background is not a property map, so we should clear the background
+ // The background is an empty property map, so we should clear the background
controlImpl.ClearBackground();
}
break;
{
DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" );
Property::Map map;
- if( controlImpl.mImpl->mBackgroundVisual )
+ Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND );
+ if( visual )
{
- controlImpl.mImpl->mBackgroundVisual.CreatePropertyMap( map );
+ visual.CreatePropertyMap( map );
}
value = map;
break;
case Toolkit::Control::Property::BACKGROUND:
{
Property::Map map;
- if( controlImpl.mImpl->mBackgroundVisual )
+ Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND );
+ if( visual )
{
- (controlImpl.mImpl->mBackgroundVisual).CreatePropertyMap( map );
+ visual.CreatePropertyMap( map );
}
value = map;
Control& mControlImpl;
RegisteredVisualContainer mVisuals; // Stores visuals needed by the control, non trivial type so std::vector used.
std::string mStyleName;
- Toolkit::Visual::Base mBackgroundVisual; ///< The visual to render the background
Vector4 mBackgroundColor; ///< The color of the background visual
Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this
Toolkit::Control::KeyEventSignalType mKeyEventSignal;
return handle;
}
-Control::~Control()
-{
- delete mImpl;
-}
-
void Control::SetStyleName( const std::string& styleName )
{
if( styleName != mImpl->mStyleName )
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::DevelVisual::Property::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 );
- if( mImpl->mBackgroundVisual )
- {
- mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND );
- }
+
+ SetBackground( map );
}
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 );
- if( mImpl->mBackgroundVisual )
+ Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map );
+ if( visual )
{
- mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND );
+ RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual );
+ visual.SetDepthIndex( DepthIndex::BACKGROUND );
+
+ // Trigger a size negotiation request that may be needed by the new visual to relayout its contents.
+ RelayoutRequest();
}
}
void Control::SetBackgroundImage( Image image )
{
- Actor self( Self() );
- mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( image );
- RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual );
- if( mImpl->mBackgroundVisual )
+ Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image );
+ if( visual )
{
- mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND );
+ RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual );
+ visual.SetDepthIndex( DepthIndex::BACKGROUND );
}
}
void Control::ClearBackground()
{
- Actor self( Self() );
- mImpl->mBackgroundVisual.RemoveAndReset( self );
- mImpl->mBackgroundColor = Color::TRANSPARENT;
+ UnregisterVisual( Toolkit::Control::Property::BACKGROUND );
+ mImpl->mBackgroundColor = Color::TRANSPARENT;
+
+ // Trigger a size negotiation request that may be needed when unregistering a visual.
+ RelayoutRequest();
}
void Control::EnableGestureDetection(Gesture::Type type)
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
+ if( !mImpl->mVisuals.Empty() )
{
- actorToRegister = placementActor;
+ RegisteredVisualContainer::Iterator iter;
+ // Check if visual (index) is already registered. Replace if so.
+ if ( FindVisual( index, mImpl->mVisuals, iter ) )
+ {
+ if( (*iter)->visual && self.OnStage() )
+ {
+ Toolkit::GetImplementation((*iter)->visual).SetOffStage( self );
+ }
+ (*iter)->visual = visual;
+ visualReplaced = true;
+ }
}
- if ( !mImpl->mVisuals.Empty() )
+ // 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() )
{
- RegisteredVisualContainer::Iterator iter;
- // Check if visual (index) is already registered. Replace if so.
- if ( FindVisual( index, mImpl->mVisuals, iter ) )
+ // Check if the control has been type registered:
+ TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(*this) );
+ if( typeInfo )
+ {
+ // Check if the property index has been registered:
+ Property::IndexContainer indices;
+ typeInfo.GetPropertyIndices( indices );
+ Property::IndexContainer::Iterator iter = std::find( indices.Begin(), indices.End(), index );
+ if( iter != indices.End() )
{
- if( (*iter)->visual && self.OnStage() )
- {
- if( (*iter)->placementActor )
- {
- (*iter)->visual.SetOffStage( (*iter)->placementActor );
- }
- else
- {
- (*iter)->visual.SetOffStage( self );
- }
- }
- (*iter)->visual = visual;
- (*iter)->placementActor = actorToRegister;
- visualReplaced = true;
+ // If it has, then get it's name and use that for the visual
+ std::string visualName = typeInfo.GetPropertyName( index );
+ visual.SetName( visualName );
}
+ }
}
- if ( !visualReplaced ) // New registration entry
+ 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 );
}
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::RegisterVisual number of registered visuals(%d)\n", mImpl->mVisuals.Size() );
+
}
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 );
}
}
{
if ( (*iter)->enabled == enable )
{
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual Already enabled set (%s) \n", enable?"enabled":"disabled");
return;
}
(*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 );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting Visual(%d) on stage \n", index );
+ Toolkit::GetImplementation((*iter)->visual).SetOnStage( parentActor );
}
else
{
- (*iter)->visual.SetOffStage( parentActor ); // No need to call if control not staged.
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting Visual(%d) off stage \n", index );
+ Toolkit::GetImplementation((*iter)->visual).SetOffStage( parentActor ); // No need to call if control not staged.
}
}
}
return false;
}
-Actor Control::GetPlacementActor( Property::Index index ) const
-{
- RegisteredVisualContainer::Iterator iter;
- if ( FindVisual( index, mImpl->mVisuals, iter ) )
- {
- if( (*iter)->placementActor )
- {
- return (*iter)->placementActor;
- }
- else
- {
- return Self();
- }
- }
-
- return Actor();
-}
-
Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle )
{
Dali::Animation transition;
iter != end; ++iter )
{
TransitionData::Animator* animator = (*iter);
- VisualProperty visualProperty;
+ 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 );
- visualProperty = VisualProperty( child, propertyIndex );
+ Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey );
+ handleIndex = HandleIndex( child, propertyIndex );
}
else
{
- // Is it a placement actor/visual pair?;
- visualProperty = GetVisualProperty( *this, mImpl->mVisuals,
+ handleIndex = GetVisualProperty( *this, mImpl->mVisuals,
animator->objectName,
animator->propertyKey );
}
- if( visualProperty.handle && visualProperty.index != Property::INVALID_INDEX )
+ if( handleIndex.handle && handleIndex.index != Property::INVALID_INDEX )
{
if( animator->animate == false )
{
if( animator->targetValue.GetType() != Property::NONE )
{
- visualProperty.handle.SetProperty( visualProperty.index, animator->targetValue );
+ handleIndex.handle.SetProperty( handleIndex.index, animator->targetValue );
}
}
else
{
if( animator->initialValue.GetType() != Property::NONE )
{
- visualProperty.handle.SetProperty( visualProperty.index, animator->initialValue );
+ handleIndex.handle.SetProperty( handleIndex.index, animator->initialValue );
}
if( ! transition )
transition = Dali::Animation::New( 0.1f );
}
- transition.AnimateTo( Property( visualProperty.handle, visualProperty.index ),
+ transition.AnimateTo( Property( handleIndex.handle, handleIndex.index ),
animator->targetValue,
animator->alphaFunction,
TimePeriod( animator->timePeriodDelay,
return transition;
}
-
bool Control::OnAccessibilityActivated()
{
return false; // Accessibility activation is not handled by default
mImpl->mFlags = behaviourFlags;
}
+Control::~Control()
+{
+ delete mImpl;
+}
+
void Control::Initialize()
{
// Call deriving classes so initialised before styling is applied to them.
void Control::OnControlChildAdd( Actor& child )
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: OnControlChildAdd() is deprecated and will be removed from next release. Override OnChildAdd instead.\n" );
}
void Control::OnControlChildRemove( Actor& child )
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: OnControlChildRemove() is deprecated and will be removed from next release. Override OnChildRemove instead.\n" );
}
void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
void Control::OnStageConnection( int depth )
{
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection number of registered visuals(%d)\n", mImpl->mVisuals.Size() );
+
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 );
- }
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection Setting visual(%d) on stage\n", (*iter)->index );
+ Actor self( Self() );
+ Toolkit::GetImplementation((*iter)->visual).SetOnStage( self );
}
}
}
{
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 );
- }
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageDisconnection Setting visual(%d) off stage\n", (*iter)->index );
+ Actor self( Self() );
+ Toolkit::GetImplementation((*iter)->visual).SetOffStage( self );
}
}
}
void Control::OnSizeSet(const Vector3& targetSize)
{
- if( mImpl->mBackgroundVisual )
+ Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND );
+ if( visual )
{
Vector2 size( targetSize );
- mImpl->mBackgroundVisual.SetSize( size );
+ Property::Map transformMap;
+ SetDefaultTransform( transformMap );
+ visual.SetTransformAndSize( transformMap, size );
}
}
{
container.Add( Self().GetChildAt( i ), size );
}
+
+ Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND );
+ if( visual )
+ {
+ Vector2 controlSize( size );
+ Property::Map transformMap;
+ SetDefaultTransform( transformMap );
+ visual.SetTransformAndSize( transformMap, controlSize );
+ }
}
void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
Vector3 Control::GetNaturalSize()
{
- if( mImpl->mBackgroundVisual )
+ Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND );
+ if( visual )
{
Vector2 naturalSize;
- mImpl->mBackgroundVisual.GetNaturalSize(naturalSize);
- return Vector3(naturalSize);
+ visual.GetNaturalSize( naturalSize );
+ return Vector3( naturalSize );
}
return Vector3::ZERO;
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff