X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Factors%2Factor-impl.cpp;h=d36e103eb351ce44e24db4f8b0f14fdaf1b3f107;hb=63a75802b362f787f4331567cbbc137b9ecde652;hp=b7b8f741022b77fe56a453a26e0f5be20c5cfa89;hpb=14db3d9a0fc38296bd016ea0a890feb820c48b14;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index b7b8f74..d36e103 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * 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. @@ -24,15 +24,16 @@ #include // INTERNAL INCLUDES - +#include #include #include +#include #include #include #include #include +#include #include - #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -57,39 +57,13 @@ using Dali::Internal::SceneGraph::Node; using Dali::Internal::SceneGraph::AnimatableProperty; using Dali::Internal::SceneGraph::PropertyBase; -namespace Dali -{ -namespace ResizePolicy -{ - -namespace -{ -DALI_ENUM_TO_STRING_TABLE_BEGIN( Type ) -DALI_ENUM_TO_STRING( FIXED ) -DALI_ENUM_TO_STRING( USE_NATURAL_SIZE ) -DALI_ENUM_TO_STRING( FILL_TO_PARENT ) -DALI_ENUM_TO_STRING( SIZE_RELATIVE_TO_PARENT ) -DALI_ENUM_TO_STRING( SIZE_FIXED_OFFSET_FROM_PARENT ) -DALI_ENUM_TO_STRING( FIT_TO_CHILDREN ) -DALI_ENUM_TO_STRING( DIMENSION_DEPENDENCY ) -DALI_ENUM_TO_STRING( USE_ASSIGNED_SIZE ) -DALI_ENUM_TO_STRING_TABLE_END( Type ) - -} // unnamed namespace -} // ResizePolicy +#if defined(DEBUG_ENABLED) +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_DEPTH_TIMER" ); +Debug::Filter* gLogRelayoutFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_RELAYOUT_TIMER" ); +#endif -namespace SizeScalePolicy -{ -namespace +namespace Dali { -// Enumeration to / from string conversion tables -DALI_ENUM_TO_STRING_TABLE_BEGIN( Type ) -DALI_ENUM_TO_STRING( USE_SIZE_SET ) -DALI_ENUM_TO_STRING( FIT_WITH_ASPECT_RATIO ) -DALI_ENUM_TO_STRING( FILL_WITH_ASPECT_RATIO ) -DALI_ENUM_TO_STRING_TABLE_END( Type ) -} // unnamed namespace -} // SizeScalePolicy namespace Internal { @@ -132,6 +106,7 @@ struct Actor::RelayoutData for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i ) { resizePolicies[ i ] = ResizePolicy::DEFAULT; + useAssignedSize[ i ] = false; negotiatedDimensions[ i ] = 0.0f; dimensionNegotiated[ i ] = false; dimensionDirty[ i ] = false; @@ -143,6 +118,7 @@ struct Actor::RelayoutData } ResizePolicy::Type resizePolicies[ Dimension::DIMENSION_COUNT ]; ///< Resize policies + bool useAssignedSize[ Dimension::DIMENSION_COUNT ]; ///< The flag to specify whether the size should be assigned to the actor Dimension::Type dimensionDependencies[ Dimension::DIMENSION_COUNT ]; ///< A list of dimension dependencies @@ -174,62 +150,69 @@ namespace // unnamed namespace /** * We want to discourage the use of property strings (minimize string comparisons), * particularly for the default properties. - * Name Type writable animatable constraint-input enum for index-checking + * Name Type writable animatable constraint-input enum for index-checking */ DALI_PROPERTY_TABLE_BEGIN -DALI_PROPERTY( "parentOrigin", VECTOR3, true, false, true, Dali::Actor::Property::PARENT_ORIGIN ) -DALI_PROPERTY( "parentOriginX", FLOAT, true, false, true, Dali::Actor::Property::PARENT_ORIGIN_X ) -DALI_PROPERTY( "parentOriginY", FLOAT, true, false, true, Dali::Actor::Property::PARENT_ORIGIN_Y ) -DALI_PROPERTY( "parentOriginZ", FLOAT, true, false, true, Dali::Actor::Property::PARENT_ORIGIN_Z ) -DALI_PROPERTY( "anchorPoint", VECTOR3, true, false, true, Dali::Actor::Property::ANCHOR_POINT ) -DALI_PROPERTY( "anchorPointX", FLOAT, true, false, true, Dali::Actor::Property::ANCHOR_POINT_X ) -DALI_PROPERTY( "anchorPointY", FLOAT, true, false, true, Dali::Actor::Property::ANCHOR_POINT_Y ) -DALI_PROPERTY( "anchorPointZ", FLOAT, true, false, true, Dali::Actor::Property::ANCHOR_POINT_Z ) -DALI_PROPERTY( "size", VECTOR3, true, true, true, Dali::Actor::Property::SIZE ) -DALI_PROPERTY( "sizeWidth", FLOAT, true, true, true, Dali::Actor::Property::SIZE_WIDTH ) -DALI_PROPERTY( "sizeHeight", FLOAT, true, true, true, Dali::Actor::Property::SIZE_HEIGHT ) -DALI_PROPERTY( "sizeDepth", FLOAT, true, true, true, Dali::Actor::Property::SIZE_DEPTH ) -DALI_PROPERTY( "position", VECTOR3, true, true, true, Dali::Actor::Property::POSITION ) -DALI_PROPERTY( "positionX", FLOAT, true, true, true, Dali::Actor::Property::POSITION_X ) -DALI_PROPERTY( "positionY", FLOAT, true, true, true, Dali::Actor::Property::POSITION_Y ) -DALI_PROPERTY( "positionZ", FLOAT, true, true, true, Dali::Actor::Property::POSITION_Z ) -DALI_PROPERTY( "worldPosition", VECTOR3, false, false, true, Dali::Actor::Property::WORLD_POSITION ) -DALI_PROPERTY( "worldPositionX", FLOAT, false, false, true, Dali::Actor::Property::WORLD_POSITION_X ) -DALI_PROPERTY( "worldPositionY", FLOAT, false, false, true, Dali::Actor::Property::WORLD_POSITION_Y ) -DALI_PROPERTY( "worldPositionZ", FLOAT, false, false, true, Dali::Actor::Property::WORLD_POSITION_Z ) -DALI_PROPERTY( "orientation", ROTATION, true, true, true, Dali::Actor::Property::ORIENTATION ) -DALI_PROPERTY( "worldOrientation", ROTATION, false, false, true, Dali::Actor::Property::WORLD_ORIENTATION ) -DALI_PROPERTY( "scale", VECTOR3, true, true, true, Dali::Actor::Property::SCALE ) -DALI_PROPERTY( "scaleX", FLOAT, true, true, true, Dali::Actor::Property::SCALE_X ) -DALI_PROPERTY( "scaleY", FLOAT, true, true, true, Dali::Actor::Property::SCALE_Y ) -DALI_PROPERTY( "scaleZ", FLOAT, true, true, true, Dali::Actor::Property::SCALE_Z ) -DALI_PROPERTY( "worldScale", VECTOR3, false, false, true, Dali::Actor::Property::WORLD_SCALE ) -DALI_PROPERTY( "visible", BOOLEAN, true, true, true, Dali::Actor::Property::VISIBLE ) -DALI_PROPERTY( "color", VECTOR4, true, true, true, Dali::Actor::Property::COLOR ) -DALI_PROPERTY( "colorRed", FLOAT, true, true, true, Dali::Actor::Property::COLOR_RED ) -DALI_PROPERTY( "colorGreen", FLOAT, true, true, true, Dali::Actor::Property::COLOR_GREEN ) -DALI_PROPERTY( "colorBlue", FLOAT, true, true, true, Dali::Actor::Property::COLOR_BLUE ) -DALI_PROPERTY( "colorAlpha", FLOAT, true, true, true, Dali::Actor::Property::COLOR_ALPHA ) -DALI_PROPERTY( "worldColor", VECTOR4, false, false, true, Dali::Actor::Property::WORLD_COLOR ) -DALI_PROPERTY( "worldMatrix", MATRIX, false, false, true, Dali::Actor::Property::WORLD_MATRIX ) -DALI_PROPERTY( "name", STRING, true, false, false, Dali::Actor::Property::NAME ) -DALI_PROPERTY( "sensitive", BOOLEAN, true, false, false, Dali::Actor::Property::SENSITIVE ) -DALI_PROPERTY( "leaveRequired", BOOLEAN, true, false, false, Dali::Actor::Property::LEAVE_REQUIRED ) -DALI_PROPERTY( "inheritOrientation", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_ORIENTATION ) -DALI_PROPERTY( "inheritScale", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_SCALE ) -DALI_PROPERTY( "colorMode", STRING, true, false, false, Dali::Actor::Property::COLOR_MODE ) -DALI_PROPERTY( "positionInheritance", STRING, true, false, false, Dali::Actor::Property::POSITION_INHERITANCE ) -DALI_PROPERTY( "drawMode", STRING, true, false, false, Dali::Actor::Property::DRAW_MODE ) -DALI_PROPERTY( "sizeModeFactor", VECTOR3, true, false, false, Dali::Actor::Property::SIZE_MODE_FACTOR ) -DALI_PROPERTY( "widthResizePolicy", STRING, true, false, false, Dali::Actor::Property::WIDTH_RESIZE_POLICY ) -DALI_PROPERTY( "heightResizePolicy", STRING, true, false, false, Dali::Actor::Property::HEIGHT_RESIZE_POLICY ) -DALI_PROPERTY( "sizeScalePolicy", STRING, true, false, false, Dali::Actor::Property::SIZE_SCALE_POLICY ) -DALI_PROPERTY( "widthForHeight", BOOLEAN, true, false, false, Dali::Actor::Property::WIDTH_FOR_HEIGHT ) -DALI_PROPERTY( "heightForWidth", BOOLEAN, true, false, false, Dali::Actor::Property::HEIGHT_FOR_WIDTH ) -DALI_PROPERTY( "padding", VECTOR4, true, false, false, Dali::Actor::Property::PADDING ) -DALI_PROPERTY( "minimumSize", VECTOR2, true, false, false, Dali::Actor::Property::MINIMUM_SIZE ) -DALI_PROPERTY( "maximumSize", VECTOR2, true, false, false, Dali::Actor::Property::MAXIMUM_SIZE ) -DALI_PROPERTY( "inheritPosition", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_POSITION ) +DALI_PROPERTY( "parentOrigin", VECTOR3, true, false, true, Dali::Actor::Property::PARENT_ORIGIN ) +DALI_PROPERTY( "parentOriginX", FLOAT, true, false, true, Dali::Actor::Property::PARENT_ORIGIN_X ) +DALI_PROPERTY( "parentOriginY", FLOAT, true, false, true, Dali::Actor::Property::PARENT_ORIGIN_Y ) +DALI_PROPERTY( "parentOriginZ", FLOAT, true, false, true, Dali::Actor::Property::PARENT_ORIGIN_Z ) +DALI_PROPERTY( "anchorPoint", VECTOR3, true, false, true, Dali::Actor::Property::ANCHOR_POINT ) +DALI_PROPERTY( "anchorPointX", FLOAT, true, false, true, Dali::Actor::Property::ANCHOR_POINT_X ) +DALI_PROPERTY( "anchorPointY", FLOAT, true, false, true, Dali::Actor::Property::ANCHOR_POINT_Y ) +DALI_PROPERTY( "anchorPointZ", FLOAT, true, false, true, Dali::Actor::Property::ANCHOR_POINT_Z ) +DALI_PROPERTY( "size", VECTOR3, true, true, true, Dali::Actor::Property::SIZE ) +DALI_PROPERTY( "sizeWidth", FLOAT, true, true, true, Dali::Actor::Property::SIZE_WIDTH ) +DALI_PROPERTY( "sizeHeight", FLOAT, true, true, true, Dali::Actor::Property::SIZE_HEIGHT ) +DALI_PROPERTY( "sizeDepth", FLOAT, true, true, true, Dali::Actor::Property::SIZE_DEPTH ) +DALI_PROPERTY( "position", VECTOR3, true, true, true, Dali::Actor::Property::POSITION ) +DALI_PROPERTY( "positionX", FLOAT, true, true, true, Dali::Actor::Property::POSITION_X ) +DALI_PROPERTY( "positionY", FLOAT, true, true, true, Dali::Actor::Property::POSITION_Y ) +DALI_PROPERTY( "positionZ", FLOAT, true, true, true, Dali::Actor::Property::POSITION_Z ) +DALI_PROPERTY( "worldPosition", VECTOR3, false, false, true, Dali::Actor::Property::WORLD_POSITION ) +DALI_PROPERTY( "worldPositionX", FLOAT, false, false, true, Dali::Actor::Property::WORLD_POSITION_X ) +DALI_PROPERTY( "worldPositionY", FLOAT, false, false, true, Dali::Actor::Property::WORLD_POSITION_Y ) +DALI_PROPERTY( "worldPositionZ", FLOAT, false, false, true, Dali::Actor::Property::WORLD_POSITION_Z ) +DALI_PROPERTY( "orientation", ROTATION, true, true, true, Dali::Actor::Property::ORIENTATION ) +DALI_PROPERTY( "worldOrientation", ROTATION, false, false, true, Dali::Actor::Property::WORLD_ORIENTATION ) +DALI_PROPERTY( "scale", VECTOR3, true, true, true, Dali::Actor::Property::SCALE ) +DALI_PROPERTY( "scaleX", FLOAT, true, true, true, Dali::Actor::Property::SCALE_X ) +DALI_PROPERTY( "scaleY", FLOAT, true, true, true, Dali::Actor::Property::SCALE_Y ) +DALI_PROPERTY( "scaleZ", FLOAT, true, true, true, Dali::Actor::Property::SCALE_Z ) +DALI_PROPERTY( "worldScale", VECTOR3, false, false, true, Dali::Actor::Property::WORLD_SCALE ) +DALI_PROPERTY( "visible", BOOLEAN, true, true, true, Dali::Actor::Property::VISIBLE ) +DALI_PROPERTY( "color", VECTOR4, true, true, true, Dali::Actor::Property::COLOR ) +DALI_PROPERTY( "colorRed", FLOAT, true, true, true, Dali::Actor::Property::COLOR_RED ) +DALI_PROPERTY( "colorGreen", FLOAT, true, true, true, Dali::Actor::Property::COLOR_GREEN ) +DALI_PROPERTY( "colorBlue", FLOAT, true, true, true, Dali::Actor::Property::COLOR_BLUE ) +DALI_PROPERTY( "colorAlpha", FLOAT, true, true, true, Dali::Actor::Property::COLOR_ALPHA ) +DALI_PROPERTY( "worldColor", VECTOR4, false, false, true, Dali::Actor::Property::WORLD_COLOR ) +DALI_PROPERTY( "worldMatrix", MATRIX, false, false, true, Dali::Actor::Property::WORLD_MATRIX ) +DALI_PROPERTY( "name", STRING, true, false, false, Dali::Actor::Property::NAME ) +DALI_PROPERTY( "sensitive", BOOLEAN, true, false, false, Dali::Actor::Property::SENSITIVE ) +DALI_PROPERTY( "leaveRequired", BOOLEAN, true, false, false, Dali::Actor::Property::LEAVE_REQUIRED ) +DALI_PROPERTY( "inheritOrientation", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_ORIENTATION ) +DALI_PROPERTY( "inheritScale", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_SCALE ) +DALI_PROPERTY( "colorMode", STRING, true, false, false, Dali::Actor::Property::COLOR_MODE ) +DALI_PROPERTY( "positionInheritance", STRING, true, false, false, Dali::Actor::Property::POSITION_INHERITANCE ) +DALI_PROPERTY( "drawMode", STRING, true, false, false, Dali::Actor::Property::DRAW_MODE ) +DALI_PROPERTY( "sizeModeFactor", VECTOR3, true, false, false, Dali::Actor::Property::SIZE_MODE_FACTOR ) +DALI_PROPERTY( "widthResizePolicy", STRING, true, false, false, Dali::Actor::Property::WIDTH_RESIZE_POLICY ) +DALI_PROPERTY( "heightResizePolicy", STRING, true, false, false, Dali::Actor::Property::HEIGHT_RESIZE_POLICY ) +DALI_PROPERTY( "sizeScalePolicy", STRING, true, false, false, Dali::Actor::Property::SIZE_SCALE_POLICY ) +DALI_PROPERTY( "widthForHeight", BOOLEAN, true, false, false, Dali::Actor::Property::WIDTH_FOR_HEIGHT ) +DALI_PROPERTY( "heightForWidth", BOOLEAN, true, false, false, Dali::Actor::Property::HEIGHT_FOR_WIDTH ) +DALI_PROPERTY( "padding", VECTOR4, true, false, false, Dali::Actor::Property::PADDING ) +DALI_PROPERTY( "minimumSize", VECTOR2, true, false, false, Dali::Actor::Property::MINIMUM_SIZE ) +DALI_PROPERTY( "maximumSize", VECTOR2, true, false, false, Dali::Actor::Property::MAXIMUM_SIZE ) +DALI_PROPERTY( "inheritPosition", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_POSITION ) +DALI_PROPERTY( "clippingMode", STRING, true, false, false, Dali::Actor::Property::CLIPPING_MODE ) +DALI_PROPERTY( "layoutDirection", STRING, true, false, false, Dali::Actor::Property::LAYOUT_DIRECTION ) +DALI_PROPERTY( "inheritLayoutDirection", BOOLEAN, true, false, false, Dali::Actor::Property::INHERIT_LAYOUT_DIRECTION ) +DALI_PROPERTY( "siblingOrder", INTEGER, true, false, false, Dali::DevelActor::Property::SIBLING_ORDER ) +DALI_PROPERTY( "opacity", FLOAT, true, true, true, Dali::DevelActor::Property::OPACITY ) +DALI_PROPERTY( "screenPosition", VECTOR2, false, false, false, Dali::DevelActor::Property::SCREEN_POSITION ) +DALI_PROPERTY( "positionUsesAnchorPoint", BOOLEAN, true, false, false, Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT ) DALI_PROPERTY_TABLE_END( DEFAULT_ACTOR_PROPERTY_START_INDEX ) // Signals @@ -240,6 +223,7 @@ const char* const SIGNAL_WHEEL_EVENT = "wheelEvent"; const char* const SIGNAL_ON_STAGE = "onStage"; const char* const SIGNAL_OFF_STAGE = "offStage"; const char* const SIGNAL_ON_RELAYOUT = "onRelayout"; +const char* const SIGNAL_TOUCH = "touch"; // Actions @@ -259,10 +243,96 @@ SignalConnectorType signalConnector3( mType, SIGNAL_WHEEL_EVENT, &Actor::DoConne SignalConnectorType signalConnector4( mType, SIGNAL_ON_STAGE, &Actor::DoConnectSignal ); SignalConnectorType signalConnector5( mType, SIGNAL_OFF_STAGE, &Actor::DoConnectSignal ); SignalConnectorType signalConnector6( mType, SIGNAL_ON_RELAYOUT, &Actor::DoConnectSignal ); +SignalConnectorType signalConnector7( mType, SIGNAL_TOUCH, &Actor::DoConnectSignal ); TypeAction a1( mType, ACTION_SHOW, &Actor::DoAction ); TypeAction a2( mType, ACTION_HIDE, &Actor::DoAction ); +struct AnchorValue +{ + const char* name; + const Vector3& value; +}; + +DALI_ENUM_TO_STRING_TABLE_BEGIN_WITH_TYPE( AnchorValue, ANCHOR_CONSTANT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, TOP_LEFT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, TOP_CENTER ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, TOP_RIGHT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, CENTER_LEFT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, CENTER ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, CENTER_RIGHT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, BOTTOM_LEFT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, BOTTOM_CENTER ) +DALI_ENUM_TO_STRING_WITH_SCOPE( AnchorPoint, BOTTOM_RIGHT ) +DALI_ENUM_TO_STRING_TABLE_END( ANCHOR_CONSTANT ) + +DALI_ENUM_TO_STRING_TABLE_BEGIN( COLOR_MODE ) +DALI_ENUM_TO_STRING( USE_OWN_COLOR ) +DALI_ENUM_TO_STRING( USE_PARENT_COLOR ) +DALI_ENUM_TO_STRING( USE_OWN_MULTIPLY_PARENT_COLOR ) +DALI_ENUM_TO_STRING( USE_OWN_MULTIPLY_PARENT_ALPHA ) +DALI_ENUM_TO_STRING_TABLE_END( COLOR_MODE ) + +DALI_ENUM_TO_STRING_TABLE_BEGIN( POSITION_INHERITANCE_MODE ) +DALI_ENUM_TO_STRING( INHERIT_PARENT_POSITION ) +DALI_ENUM_TO_STRING( USE_PARENT_POSITION ) +DALI_ENUM_TO_STRING( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ) +DALI_ENUM_TO_STRING( DONT_INHERIT_POSITION ) +DALI_ENUM_TO_STRING_TABLE_END( POSITION_INHERITANCE_MODE ) + +DALI_ENUM_TO_STRING_TABLE_BEGIN( DRAW_MODE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DrawMode, NORMAL ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DrawMode, OVERLAY_2D ) +DALI_ENUM_TO_STRING_WITH_SCOPE( DrawMode, STENCIL ) +DALI_ENUM_TO_STRING_TABLE_END( DRAW_MODE ) + +DALI_ENUM_TO_STRING_TABLE_BEGIN( RESIZE_POLICY ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, FIXED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, USE_NATURAL_SIZE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, FILL_TO_PARENT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, SIZE_RELATIVE_TO_PARENT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, SIZE_FIXED_OFFSET_FROM_PARENT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, FIT_TO_CHILDREN ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, DIMENSION_DEPENDENCY ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ResizePolicy, USE_ASSIGNED_SIZE ) +DALI_ENUM_TO_STRING_TABLE_END( RESIZE_POLICY ) + +DALI_ENUM_TO_STRING_TABLE_BEGIN( SIZE_SCALE_POLICY ) +DALI_ENUM_TO_STRING_WITH_SCOPE( SizeScalePolicy, USE_SIZE_SET ) +DALI_ENUM_TO_STRING_WITH_SCOPE( SizeScalePolicy, FIT_WITH_ASPECT_RATIO ) +DALI_ENUM_TO_STRING_WITH_SCOPE( SizeScalePolicy, FILL_WITH_ASPECT_RATIO ) +DALI_ENUM_TO_STRING_TABLE_END( SIZE_SCALE_POLICY ) + +DALI_ENUM_TO_STRING_TABLE_BEGIN( CLIPPING_MODE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ClippingMode, DISABLED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ClippingMode, CLIP_CHILDREN ) +DALI_ENUM_TO_STRING_TABLE_END( CLIPPING_MODE ) + +DALI_ENUM_TO_STRING_TABLE_BEGIN( LAYOUT_DIRECTION ) +DALI_ENUM_TO_STRING_WITH_SCOPE( LayoutDirection, LEFT_TO_RIGHT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( LayoutDirection, RIGHT_TO_LEFT ) +DALI_ENUM_TO_STRING_TABLE_END( LAYOUT_DIRECTION ) + +bool GetAnchorPointConstant( const std::string& value, Vector3& anchor ) +{ + for( unsigned int i = 0; i < ANCHOR_CONSTANT_TABLE_COUNT; ++i ) + { + size_t sizeIgnored = 0; + if( CompareTokens( value.c_str(), ANCHOR_CONSTANT_TABLE[ i ].name, sizeIgnored ) ) + { + anchor = ANCHOR_CONSTANT_TABLE[ i ].value; + return true; + } + } + return false; +} + +inline bool GetParentOriginConstant( const std::string& value, Vector3& parentOrigin ) +{ + // Values are the same so just use the same table as anchor-point + return GetAnchorPointConstant( value, parentOrigin ); +} + /** * @brief Extract a given dimension from a Vector2 * @@ -302,6 +372,28 @@ float GetDimensionValue( const Vector3& values, Dimension::Type dimension ) return GetDimensionValue( values.GetVectorXY(), dimension ); } +/** + * @brief Recursively emits the visibility-changed-signal on the actor tree. + * @param[in] actor The actor to emit the signal on + * @param[in] visible The new visibility of the actor + * @param[in] type Whether the actor's visible property has changed or a parent's + */ +void EmitVisibilityChangedSignalRecursively( ActorPtr actor, bool visible, DevelActor::VisibilityChange::Type type ) +{ + if( actor ) + { + actor->EmitVisibilityChangedSignal( visible, type ); + + if( actor->GetChildCount() > 0 ) + { + ActorContainer& children = actor->GetChildrenInternal(); + for( ActorIter iter = children.begin(), endIter = children.end(); iter != endIter; ++iter ) + { + EmitVisibilityChangedSignalRecursively( *iter, visible, DevelActor::VisibilityChange::PARENT ); + } + } + } +} } // unnamed namespace @@ -336,23 +428,6 @@ unsigned int Actor::GetId() const return mId; } -void Actor::Attach( ActorAttachment& attachment ) -{ - DALI_ASSERT_DEBUG( !mAttachment && "An Actor can only have one attachment" ); - - if( OnStage() ) - { - attachment.Connect(); - } - - mAttachment = ActorAttachmentPtr( &attachment ); -} - -ActorAttachmentPtr Actor::GetAttachment() -{ - return mAttachment; -} - bool Actor::OnStage() const { return mIsOnStage; @@ -419,6 +494,8 @@ void Actor::Add( Actor& child ) // Notification for derived classes OnChildAdd( child ); + InheritLayoutDirectionRecursively( ActorPtr( &child ), mLayoutDirection ); + // Only put in a relayout request if there is a suitable dependency if( RelayoutDependentOnChildren() ) { @@ -461,15 +538,15 @@ void Actor::Remove( Actor& child ) if( removed ) { - // Notification for derived classes - OnChildRemove( *(removed.Get()) ); - // Only put in a relayout request if there is a suitable dependency if( RelayoutDependentOnChildren() ) { RelayoutRequest(); } } + + // Notification for derived classes + OnChildRemove( child ); } void Actor::Unparent() @@ -735,6 +812,24 @@ const Vector3& Actor::GetCurrentWorldPosition() const return Vector3::ZERO; } +const Vector2 Actor::GetCurrentScreenPosition() const +{ + if( OnStage() && NULL != mNode ) + { + StagePtr stage = Stage::GetCurrent(); + Vector3 worldPosition = mNode->GetWorldPosition( GetEventThreadServices().GetEventBufferIndex() ); + Vector3 actorSize = GetCurrentSize() * GetCurrentWorldScale(); + Vector2 halfStageSize( stage->GetSize() * 0.5f ); // World position origin is center of stage + Vector3 halfActorSize( actorSize * 0.5f ); + Vector3 anchorPointOffSet = halfActorSize - actorSize * ( mPositionUsesAnchorPoint ? GetCurrentAnchorPoint() : AnchorPoint::TOP_LEFT ); + + return Vector2( halfStageSize.width + worldPosition.x - anchorPointOffSet.x, + halfStageSize.height + worldPosition.y - anchorPointOffSet.y ); + } + + return Vector2::ZERO; +} + void Actor::SetPositionInheritanceMode( PositionInheritanceMode mode ) { // this flag is not animatable so keep the value @@ -742,7 +837,7 @@ void Actor::SetPositionInheritanceMode( PositionInheritanceMode mode ) if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value - SetPositionInheritanceModeMessage( GetEventThreadServices(), *mNode, mode ); + SetInheritPositionMessage( GetEventThreadServices(), *mNode, mode == INHERIT_PARENT_POSITION ); } } @@ -779,6 +874,8 @@ void Actor::SetOrientation( const Radian& angle, const Vector3& axis ) void Actor::SetOrientation( const Quaternion& orientation ) { + mTargetOrientation = orientation; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -788,15 +885,13 @@ void Actor::SetOrientation( const Quaternion& orientation ) void Actor::RotateBy( const Radian& angle, const Vector3& axis ) { - if( NULL != mNode ) - { - // mNode is being used in a separate thread; queue a message to set the value & base value - SceneGraph::NodeTransformPropertyMessage::Send( GetEventThreadServices(), mNode, &mNode->mOrientation, &SceneGraph::TransformManagerPropertyHandler::BakeRelative, Quaternion(angle, axis) ); - } + RotateBy( Quaternion(angle, axis) ); } void Actor::RotateBy( const Quaternion& relativeRotation ) { + mTargetOrientation *= Quaternion( relativeRotation ); + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -838,6 +933,8 @@ void Actor::SetScale( float x, float y, float z ) void Actor::SetScale( const Vector3& scale ) { + mTargetScale = scale; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -847,6 +944,8 @@ void Actor::SetScale( const Vector3& scale ) void Actor::SetScaleX( float x ) { + mTargetScale.x = x; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -856,6 +955,8 @@ void Actor::SetScaleX( float x ) void Actor::SetScaleY( float y ) { + mTargetScale.y = y; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -865,6 +966,8 @@ void Actor::SetScaleY( float y ) void Actor::SetScaleZ( float z ) { + mTargetScale.z = z; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -874,6 +977,8 @@ void Actor::SetScaleZ( float z ) void Actor::ScaleBy(const Vector3& relativeScale) { + mTargetScale *= relativeScale; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -932,11 +1037,7 @@ Matrix Actor::GetCurrentWorldMatrix() const void Actor::SetVisible( bool visible ) { - if( NULL != mNode ) - { - // mNode is being used in a separate thread; queue a message to set the value & base value - SceneGraph::NodePropertyMessage::Send( GetEventThreadServices(), mNode, &mNode->mVisible, &AnimatableProperty::Bake, visible ); - } + SetVisibleInternal( visible, SendMessage::TRUE ); } bool Actor::IsVisible() const @@ -952,6 +1053,8 @@ bool Actor::IsVisible() const void Actor::SetOpacity( float opacity ) { + mTargetColor.a = opacity; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -970,6 +1073,16 @@ float Actor::GetCurrentOpacity() const return 1.0f; } +ClippingMode::Type Actor::GetClippingMode() const +{ + return mClippingMode; +} + +unsigned int Actor::GetSortingDepth() +{ + return mSortedDepth; +} + const Vector4& Actor::GetCurrentWorldColor() const { if( NULL != mNode ) @@ -982,6 +1095,8 @@ const Vector4& Actor::GetCurrentWorldColor() const void Actor::SetColor( const Vector4& color ) { + mTargetColor = color; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -991,6 +1106,8 @@ void Actor::SetColor( const Vector4& color ) void Actor::SetColorRed( float red ) { + mTargetColor.r = red; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -1000,6 +1117,8 @@ void Actor::SetColorRed( float red ) void Actor::SetColorGreen( float green ) { + mTargetColor.g = green; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -1009,6 +1128,8 @@ void Actor::SetColorGreen( float green ) void Actor::SetColorBlue( float blue ) { + mTargetColor.b = blue; + if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value @@ -1138,89 +1259,74 @@ void Actor::SetSizeInternal( const Vector3& size ) } } -void Actor::NotifySizeAnimation( Animation& animation, const Vector3& targetSize ) -{ - mTargetSize = targetSize; - - // Notify deriving classes - OnSizeAnimation( animation, mTargetSize ); -} - -void Actor::NotifySizeAnimation( Animation& animation, float targetSize, Property::Index property ) +void Actor::SetWidth( float width ) { - if ( Dali::Actor::Property::SIZE_WIDTH == property ) - { - mTargetSize.width = targetSize; - } - else if ( Dali::Actor::Property::SIZE_HEIGHT == property ) + if( IsRelayoutEnabled() && !mRelayoutData->insideRelayout ) { - mTargetSize.height = targetSize; + SetResizePolicy( ResizePolicy::FIXED, Dimension::WIDTH ); + mRelayoutData->preferredSize.width = width; } - else if ( Dali::Actor::Property::SIZE_DEPTH == property ) + else { - mTargetSize.depth = targetSize; + mTargetSize.width = width; + + if( NULL != mNode ) + { + // mNode is being used in a separate thread; queue a message to set the value & base value + SceneGraph::NodeTransformComponentMessage::Send( GetEventThreadServices(), mNode, &mNode->mSize, &SceneGraph::TransformManagerPropertyHandler::BakeX, width ); + } } - // Notify deriving classes - OnSizeAnimation( animation, mTargetSize ); -} -void Actor::NotifyPositionAnimation( Animation& animation, const Vector3& targetPosition ) -{ - mTargetPosition = targetPosition; + RelayoutRequest(); } -void Actor::NotifyPositionAnimation( Animation& animation, float targetPosition, Property::Index property ) +void Actor::SetHeight( float height ) { - if ( Dali::Actor::Property::POSITION_X == property ) - { - mTargetPosition.x = targetPosition; - } - else if ( Dali::Actor::Property::POSITION_Y == property ) + if( IsRelayoutEnabled() && !mRelayoutData->insideRelayout ) { - mTargetPosition.y = targetPosition; + SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); + mRelayoutData->preferredSize.height = height; } - else if ( Dali::Actor::Property::POSITION_Z == property ) + else { - mTargetPosition.z = targetPosition; + mTargetSize.height = height; + + if( NULL != mNode ) + { + // mNode is being used in a separate thread; queue a message to set the value & base value + SceneGraph::NodeTransformComponentMessage::Send( GetEventThreadServices(), mNode, &mNode->mSize, &SceneGraph::TransformManagerPropertyHandler::BakeY, height ); + } } + + RelayoutRequest(); } -void Actor::SetWidth( float width ) +void Actor::SetDepth( float depth ) { - mTargetSize.width = width; + mTargetSize.depth = depth; if( NULL != mNode ) { // mNode is being used in a separate thread; queue a message to set the value & base value - SceneGraph::NodeTransformComponentMessage::Send( GetEventThreadServices(), mNode, &mNode->mSize, &SceneGraph::TransformManagerPropertyHandler::BakeX, width ); + SceneGraph::NodeTransformComponentMessage::Send( GetEventThreadServices(), mNode, &mNode->mSize, &SceneGraph::TransformManagerPropertyHandler::BakeZ, depth ); } } -void Actor::SetHeight( float height ) +Vector3 Actor::GetTargetSize() const { - mTargetSize.height = height; + Vector3 size = mTargetSize; - if( NULL != mNode ) + // Should return preferred size if size is fixed as set by SetSize + if( GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::FIXED ) { - // mNode is being used in a separate thread; queue a message to set the value & base value - SceneGraph::NodeTransformComponentMessage::Send( GetEventThreadServices(), mNode, &mNode->mSize, &SceneGraph::TransformManagerPropertyHandler::BakeY, height ); + size.width = GetPreferredSize().width; } -} - -void Actor::SetDepth( float depth ) -{ - mTargetSize.depth = depth; - - if( NULL != mNode ) + if( GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::FIXED ) { - // mNode is being used in a separate thread; queue a message to set the value & base value - SceneGraph::NodeTransformComponentMessage::Send( GetEventThreadServices(), mNode, &mNode->mSize, &SceneGraph::TransformManagerPropertyHandler::BakeZ, depth ); + size.height = GetPreferredSize().height; } -} -const Vector3& Actor::GetTargetSize() const -{ - return mTargetSize; + return size; } const Vector3& Actor::GetCurrentSize() const @@ -1244,11 +1350,22 @@ void Actor::SetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimensio { EnsureRelayoutData(); + ResizePolicy::Type originalWidthPolicy = GetResizePolicy(Dimension::WIDTH); + ResizePolicy::Type originalHeightPolicy = GetResizePolicy(Dimension::HEIGHT); + for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i ) { if( dimension & ( 1 << i ) ) { - mRelayoutData->resizePolicies[ i ] = policy; + if ( policy == ResizePolicy::USE_ASSIGNED_SIZE ) + { + mRelayoutData->useAssignedSize[ i ] = true; + } + else + { + mRelayoutData->resizePolicies[ i ] = policy; + mRelayoutData->useAssignedSize[ i ] = false; + } } } @@ -1268,6 +1385,34 @@ void Actor::SetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimensio // If calling SetResizePolicy, assume we want relayout enabled SetRelayoutEnabled( true ); + // If the resize policy is set to be FIXED, the preferred size + // should be overrided by the target size. Otherwise the target + // size should be overrided by the preferred size. + + if( dimension & Dimension::WIDTH ) + { + if( originalWidthPolicy != ResizePolicy::FIXED && policy == ResizePolicy::FIXED ) + { + mRelayoutData->preferredSize.width = mTargetSize.width; + } + else if( originalWidthPolicy == ResizePolicy::FIXED && policy != ResizePolicy::FIXED ) + { + mTargetSize.width = mRelayoutData->preferredSize.width; + } + } + + if( dimension & Dimension::HEIGHT ) + { + if( originalHeightPolicy != ResizePolicy::FIXED && policy == ResizePolicy::FIXED ) + { + mRelayoutData->preferredSize.height = mTargetSize.height; + } + else if( originalHeightPolicy == ResizePolicy::FIXED && policy != ResizePolicy::FIXED ) + { + mTargetSize.height = mRelayoutData->preferredSize.height; + } + } + OnSetResizePolicy( policy, dimension ); // Trigger relayout on this control @@ -1283,7 +1428,14 @@ ResizePolicy::Type Actor::GetResizePolicy( Dimension::Type dimension ) const { if( ( dimension & ( 1 << i ) ) ) { - return mRelayoutData->resizePolicies[ i ]; + if( mRelayoutData->useAssignedSize[ i ] ) + { + return ResizePolicy::USE_ASSIGNED_SIZE; + } + else + { + return mRelayoutData->resizePolicies[ i ]; + } } } } @@ -1346,6 +1498,8 @@ void Actor::SetRelayoutEnabled( bool relayoutEnabled ) { EnsureRelayoutData(); + DALI_ASSERT_DEBUG( mRelayoutData && "mRelayoutData not created" ); + mRelayoutData->relayoutEnabled = relayoutEnabled; } } @@ -1407,12 +1561,6 @@ unsigned int Actor::AddRenderer( Renderer& renderer ) RendererPtr rendererPtr = RendererPtr( &renderer ); mRenderers->push_back( rendererPtr ); AddRendererMessage( GetEventThreadServices(), *mNode, renderer.GetRendererSceneObject() ); - - if( mIsOnStage) - { - rendererPtr->Connect(); - } - return index; } @@ -1465,15 +1613,6 @@ void Actor::RemoveRenderer( unsigned int index ) } } -void Actor::SetOverlay( bool enable ) -{ - // Setting STENCIL will override OVERLAY_2D - if( DrawMode::STENCIL != mDrawMode ) - { - SetDrawMode( enable ? DrawMode::OVERLAY_2D : DrawMode::NORMAL ); - } -} - bool Actor::IsOverlay() const { return ( DrawMode::OVERLAY_2D == mDrawMode ); @@ -1483,7 +1622,7 @@ void Actor::SetDrawMode( DrawMode::Type drawMode ) { // this flag is not animatable so keep the value mDrawMode = drawMode; - if( NULL != mNode ) + if( ( NULL != mNode ) && ( drawMode != DrawMode::STENCIL ) ) { // mNode is being used in a separate thread; queue a message to set the value SetDrawModeMessage( GetEventThreadServices(), *mNode, drawMode ); @@ -1686,12 +1825,11 @@ bool Actor::RaySphereTest( const Vector4& rayOrigin, const Vector4& rayDir ) con return ( b2 * b2 - a * c ) >= 0.f; } -bool Actor::RayActorTest( const Vector4& rayOrigin, const Vector4& rayDir, Vector4& hitPointLocal, float& distance ) const +bool Actor::RayActorTest( const Vector4& rayOrigin, const Vector4& rayDir, Vector2& hitPointLocal, float& distance ) const { bool hit = false; - if( OnStage() && - NULL != mNode ) + if( OnStage() && NULL != mNode ) { // Transforms the ray to the local reference system. // Calculate the inverse of Model matrix @@ -1749,7 +1887,7 @@ bool Actor::IsKeyboardFocusable() const bool Actor::GetTouchRequired() const { - return !mTouchedSignal.Empty() || mDerivedRequiresTouch; + return !mTouchedSignal.Empty() || !mTouchSignal.Empty() || mDerivedRequiresTouch; } bool Actor::GetHoverRequired() const @@ -1783,20 +1921,26 @@ bool Actor::IsGestureRequred( Gesture::Type type ) const return mGestureData && mGestureData->IsGestureRequred( type ); } -bool Actor::EmitTouchEventSignal( const TouchEvent& event ) +bool Actor::EmitTouchEventSignal( const TouchEvent& event, const Dali::TouchData& touch ) { bool consumed = false; + if( !mTouchSignal.Empty() ) + { + Dali::Actor handle( this ); + consumed = mTouchSignal.Emit( handle, touch ); + } + if( !mTouchedSignal.Empty() ) { Dali::Actor handle( this ); - consumed = mTouchedSignal.Emit( handle, event ); + consumed |= mTouchedSignal.Emit( handle, event ); } if( !consumed ) { // Notification for derived classes - consumed = OnTouchEvent( event ); + consumed = OnTouchEvent( event ); // TODO } return consumed; @@ -1840,11 +1984,34 @@ bool Actor::EmitWheelEventSignal( const WheelEvent& event ) return consumed; } +void Actor::EmitVisibilityChangedSignal( bool visible, DevelActor::VisibilityChange::Type type ) +{ + if( ! mVisibilityChangedSignal.Empty() ) + { + Dali::Actor handle( this ); + mVisibilityChangedSignal.Emit( handle, visible, type ); + } +} + +void Actor::EmitLayoutDirectionChangedSignal( LayoutDirection::Type type ) +{ + if( ! mLayoutDirectionChangedSignal.Empty() ) + { + Dali::Actor handle( this ); + mLayoutDirectionChangedSignal.Emit( handle, type ); + } +} + Dali::Actor::TouchSignalType& Actor::TouchedSignal() { return mTouchedSignal; } +Dali::Actor::TouchDataSignalType& Actor::TouchSignal() +{ + return mTouchSignal; +} + Dali::Actor::HoverSignalType& Actor::HoveredSignal() { return mHoveredSignal; @@ -1870,10 +2037,20 @@ Dali::Actor::OnRelayoutSignalType& Actor::OnRelayoutSignal() return mOnRelayoutSignal; } +DevelActor::VisibilityChangedSignalType& Actor::VisibilityChangedSignal() +{ + return mVisibilityChangedSignal; +} + +Dali::Actor::LayoutDirectionChangedSignalType& Actor::LayoutDirectionChangedSignal() +{ + return mLayoutDirectionChangedSignal; +} + bool Actor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { bool connected( true ); - Actor* actor = dynamic_cast< Actor* >( object ); + Actor* actor = static_cast< Actor* >( object ); // TypeRegistry guarantees that this is the correct type. if( 0 == signalName.compare( SIGNAL_TOUCHED ) ) { @@ -1899,6 +2076,10 @@ bool Actor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra { actor->OnRelayoutSignal().Connect( tracker, functor ); } + else if( 0 == signalName.compare( SIGNAL_TOUCH ) ) + { + actor->TouchSignal().Connect( tracker, functor ); + } else { // signalName does not match any signal @@ -1917,10 +2098,14 @@ Actor::Actor( DerivedType derivedType ) mAnchorPoint( NULL ), mRelayoutData( NULL ), mGestureData( NULL ), - mAttachment(), - mTargetSize( 0.0f, 0.0f, 0.0f ), + mTargetOrientation( Quaternion::IDENTITY ), + mTargetColor( Color::WHITE ), + mTargetSize( Vector3::ZERO ), + mTargetPosition( Vector3::ZERO ), + mTargetScale( Vector3::ONE ), mName(), mId( ++mActorCounter ), // actor ID is initialised to start from 1, and 0 is reserved + mSortedDepth( 0u ), mDepth( 0u ), mIsRoot( ROOT_LAYER == derivedType ), mIsLayer( LAYER == derivedType || ROOT_LAYER == derivedType ), @@ -1936,19 +2121,23 @@ Actor::Actor( DerivedType derivedType ) mInheritPosition( true ), mInheritOrientation( true ), mInheritScale( true ), + mPositionUsesAnchorPoint( true ), + mVisible( true ), + mInheritLayoutDirection( true ), + mLayoutDirection( LayoutDirection::LEFT_TO_RIGHT ), mDrawMode( DrawMode::NORMAL ), mPositionInheritanceMode( Node::DEFAULT_POSITION_INHERITANCE_MODE ), - mColorMode( Node::DEFAULT_COLOR_MODE ) + mColorMode( Node::DEFAULT_COLOR_MODE ), + mClippingMode( ClippingMode::DISABLED ) { } void Actor::Initialize() { - // Node creation - SceneGraph::Node* node = CreateNode(); - - AddNodeMessage( GetEventThreadServices().GetUpdateManager(), *node ); // Pass ownership to scene-graph - mNode = node; // Keep raw-pointer to Node + // Node creation, keep raw-pointer to Node for messaging + mNode = CreateNode(); + OwnerPointer< SceneGraph::Node > transferOwnership( const_cast< SceneGraph::Node* >( mNode ) ); + AddNodeMessage( GetEventThreadServices().GetUpdateManager(), transferOwnership ); OnInitialize(); @@ -2002,6 +2191,12 @@ void Actor::ConnectToStage( unsigned int parentDepth ) // It protects us when the Actor hierarchy is modified during OnStageConnectionExternal callbacks. ActorContainer connectionList; + StagePtr stage = Stage::GetCurrent(); + if( stage ) + { + stage->RequestRebuildDepthTree(); + } + // This stage is atomic i.e. not interrupted by user callbacks. RecursiveConnectToStage( connectionList, parentDepth + 1 ); @@ -2057,18 +2252,6 @@ void Actor::ConnectToSceneGraph() ConnectNodeMessage( GetEventThreadServices().GetUpdateManager(), *(mParent->mNode), *mNode ); } - // Notify attachment - if( mAttachment ) - { - mAttachment->Connect(); - } - - unsigned int rendererCount( GetRendererCount() ); - for( unsigned int i(0); iConnect(); - } - // Request relayout on all actors that are added to the scenegraph RelayoutRequest(); @@ -2105,6 +2288,12 @@ void Actor::DisconnectFromStage() // It protects us when the Actor hierachy is modified during OnStageDisconnectionExternal callbacks. ActorContainer disconnectionList; + StagePtr stage = Stage::GetCurrent(); + if( stage ) + { + stage->RequestRebuildDepthTree(); + } + // This stage is atomic i.e. not interrupted by user callbacks RecursiveDisconnectFromStage( disconnectionList ); @@ -2149,18 +2338,6 @@ void Actor::DisconnectFromSceneGraph() { // Notification for Object::Observers OnSceneObjectRemove(); - - // Notify attachment - if( mAttachment ) - { - mAttachment->Disconnect(); - } - - unsigned int rendererCount( GetRendererCount() ); - for( unsigned int i(0); iDisconnect(); - } } void Actor::NotifyStageDisconnection() @@ -2202,6 +2379,44 @@ bool Actor::IsNodeConnected() const return connected; } +// This method initiates traversal of the actor tree using depth-first +// traversal to set a depth index based on traversal order. It sends a +// single message to update manager to update all the actor's nodes in +// this tree with the depth index. The sceneGraphNodeDepths vector's +// elements are ordered by depth, and could be used to reduce sorting +// in the update thread. +void Actor::RebuildDepthTree() +{ + DALI_LOG_TIMER_START(depthTimer); + + // Vector of scene-graph nodes and their depths to send to UpdateManager + // in a single message + OwnerPointer sceneGraphNodeDepths( new SceneGraph::NodeDepths() ); + + int depthIndex = 1; + DepthTraverseActorTree( sceneGraphNodeDepths, depthIndex ); + + SetDepthIndicesMessage( GetEventThreadServices().GetUpdateManager(), sceneGraphNodeDepths ); + DALI_LOG_TIMER_END(depthTimer, gLogFilter, Debug::Concise, "Depth tree traversal time: "); +} + +void Actor::DepthTraverseActorTree( OwnerPointer& sceneGraphNodeDepths, int& depthIndex ) +{ + mSortedDepth = depthIndex * DevelLayer::SIBLING_ORDER_MULTIPLIER; + sceneGraphNodeDepths->Add( const_cast( mNode ), mSortedDepth ); + + // Create/add to children of this node + if( mChildren ) + { + for( ActorContainer::iterator it = mChildren->begin(); it != mChildren->end(); ++it ) + { + Actor* childActor = (*it).Get(); + ++depthIndex; + childActor->DepthTraverseActorTree( sceneGraphNodeDepths, depthIndex ); + } + } +} + unsigned int Actor::GetDefaultPropertyCount() const { return DEFAULT_PROPERTY_COUNT; @@ -2292,7 +2507,21 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr { case Dali::Actor::Property::PARENT_ORIGIN: { - SetParentOrigin( property.Get< Vector3 >() ); + Property::Type type = property.GetType(); + if( type == Property::VECTOR3 ) + { + SetParentOrigin( property.Get< Vector3 >() ); + } + else if ( type == Property::STRING ) + { + std::string parentOriginString; + property.Get( parentOriginString ); + Vector3 parentOrigin; + if( GetParentOriginConstant( parentOriginString, parentOrigin ) ) + { + SetParentOrigin( parentOrigin ); + } + } break; } @@ -2316,7 +2545,21 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::ANCHOR_POINT: { - SetAnchorPoint( property.Get< Vector3 >() ); + Property::Type type = property.GetType(); + if( type == Property::VECTOR3 ) + { + SetAnchorPoint( property.Get< Vector3 >() ); + } + else if ( type == Property::STRING ) + { + std::string anchorPointString; + property.Get( anchorPointString ); + Vector3 anchor; + if( GetAnchorPointConstant( anchorPointString, anchor ) ) + { + SetAnchorPoint( anchor ); + } + } break; } @@ -2447,8 +2690,13 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr } case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: { - SetOpacity( property.Get< float >() ); + float value; + if( property.Get( value ) ) + { + SetOpacity( value ); + } break; } @@ -2490,19 +2738,31 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::COLOR_MODE: { - SetColorMode( Scripting::GetColorMode( property.Get< std::string >() ) ); + ColorMode mode = mColorMode; + if ( Scripting::GetEnumerationProperty< ColorMode >( property, COLOR_MODE_TABLE, COLOR_MODE_TABLE_COUNT, mode ) ) + { + SetColorMode( mode ); + } break; } case Dali::Actor::Property::POSITION_INHERITANCE: { - SetPositionInheritanceMode( Scripting::GetPositionInheritanceMode( property.Get< std::string >() ) ); + PositionInheritanceMode mode = mPositionInheritanceMode; + if( Scripting::GetEnumerationProperty< PositionInheritanceMode >( property, POSITION_INHERITANCE_MODE_TABLE, POSITION_INHERITANCE_MODE_TABLE_COUNT, mode ) ) + { + SetPositionInheritanceMode( mode ); + } break; } case Dali::Actor::Property::DRAW_MODE: { - SetDrawMode( Scripting::GetDrawMode( property.Get< std::string >() ) ); + DrawMode::Type mode = mDrawMode; + if( Scripting::GetEnumerationProperty< DrawMode::Type >( property, DRAW_MODE_TABLE, DRAW_MODE_TABLE_COUNT, mode ) ) + { + SetDrawMode( mode ); + } break; } @@ -2514,8 +2774,8 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::WIDTH_RESIZE_POLICY: { - ResizePolicy::Type type; - if( Scripting::GetEnumeration< ResizePolicy::Type >( property.Get< std::string >().c_str(), ResizePolicy::TypeTable, ResizePolicy::TypeTableCount, type ) ) + ResizePolicy::Type type = static_cast< ResizePolicy::Type >( -1 ); // Set to invalid number so it definitely gets set. + if( Scripting::GetEnumerationProperty< ResizePolicy::Type >( property, RESIZE_POLICY_TABLE, RESIZE_POLICY_TABLE_COUNT, type ) ) { SetResizePolicy( type, Dimension::WIDTH ); } @@ -2524,8 +2784,8 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::HEIGHT_RESIZE_POLICY: { - ResizePolicy::Type type; - if( Scripting::GetEnumeration< ResizePolicy::Type >( property.Get< std::string >().c_str(), ResizePolicy::TypeTable, ResizePolicy::TypeTableCount, type ) ) + ResizePolicy::Type type = static_cast< ResizePolicy::Type >( -1 ); // Set to invalid number so it definitely gets set. + if( Scripting::GetEnumerationProperty< ResizePolicy::Type >( property, RESIZE_POLICY_TABLE, RESIZE_POLICY_TABLE_COUNT, type ) ) { SetResizePolicy( type, Dimension::HEIGHT ); } @@ -2535,7 +2795,7 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr case Dali::Actor::Property::SIZE_SCALE_POLICY: { SizeScalePolicy::Type type; - if( Scripting::GetEnumeration< SizeScalePolicy::Type >( property.Get< std::string >().c_str(), SizeScalePolicy::TypeTable, SizeScalePolicy::TypeTableCount, type ) ) + if( Scripting::GetEnumeration< SizeScalePolicy::Type >( property.Get< std::string >().c_str(), SIZE_SCALE_POLICY_TABLE, SIZE_SCALE_POLICY_TABLE_COUNT, type ) ) { SetSizeScalePolicy( type ); } @@ -2584,7 +2844,68 @@ void Actor::SetDefaultProperty( Property::Index index, const Property::Value& pr break; } - default: + case Dali::DevelActor::Property::SIBLING_ORDER: + { + int value; + + if( property.Get( value ) ) + { + SetSiblingOrder( value ); + } + break; + } + + case Dali::Actor::Property::CLIPPING_MODE: + { + ClippingMode::Type convertedValue = mClippingMode; + if( Scripting::GetEnumerationProperty< ClippingMode::Type >( property, CLIPPING_MODE_TABLE, CLIPPING_MODE_TABLE_COUNT, convertedValue ) ) + { + mClippingMode = convertedValue; + if( NULL != mNode ) + { + SetClippingModeMessage( GetEventThreadServices(), *mNode, mClippingMode ); + } + } + break; + } + + case Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT: + { + bool value = false; + if( property.Get( value ) && value != mPositionUsesAnchorPoint ) + { + mPositionUsesAnchorPoint = value; + if( NULL != mNode ) + { + SetPositionUsesAnchorPointMessage( GetEventThreadServices(), *mNode, mPositionUsesAnchorPoint ); + } + } + break; + } + + case Dali::Actor::Property::LAYOUT_DIRECTION: + { + Dali::LayoutDirection::Type direction = mLayoutDirection; + mInheritLayoutDirection = false; + + if( Scripting::GetEnumerationProperty< LayoutDirection::Type >( property, LAYOUT_DIRECTION_TABLE, LAYOUT_DIRECTION_TABLE_COUNT, direction ) ) + { + InheritLayoutDirectionRecursively( this, direction, true ); + } + break; + } + + case Dali::Actor::Property::INHERIT_LAYOUT_DIRECTION: + { + bool value = false; + if( property.Get( value ) ) + { + SetInheritLayoutDirection( value ); + } + break; + } + + default: { // this can happen in the case of a non-animatable default property so just do nothing break; @@ -2743,8 +3064,7 @@ void Actor::SetSceneGraphProperty( Property::Index index, const PropertyMetadata default: { - DALI_ASSERT_ALWAYS( false && "Property type enumeration out of bounds" ); // should not come here - break; + // nothing to do for other types } } // entry.GetType } @@ -2753,336 +3073,330 @@ Property::Value Actor::GetDefaultProperty( Property::Index index ) const { Property::Value value; - switch( index ) + if( ! GetCachedPropertyValue( index, value ) ) { - case Dali::Actor::Property::PARENT_ORIGIN: - { - value = GetCurrentParentOrigin(); - break; - } + // If property value is not stored in the event-side, then it must be a scene-graph only property + GetCurrentPropertyValue( index, value ); + } - case Dali::Actor::Property::PARENT_ORIGIN_X: - { - value = GetCurrentParentOrigin().x; - break; - } + return value; +} - case Dali::Actor::Property::PARENT_ORIGIN_Y: - { - value = GetCurrentParentOrigin().y; - break; - } +Property::Value Actor::GetDefaultPropertyCurrentValue( Property::Index index ) const +{ + Property::Value value; - case Dali::Actor::Property::PARENT_ORIGIN_Z: - { - value = GetCurrentParentOrigin().z; - break; - } + if( ! GetCurrentPropertyValue( index, value ) ) + { + // If unable to retrieve scene-graph property value, then it must be an event-side only property + GetCachedPropertyValue( index, value ); + } - case Dali::Actor::Property::ANCHOR_POINT: - { - value = GetCurrentAnchorPoint(); - break; - } + return value; +} - case Dali::Actor::Property::ANCHOR_POINT_X: +void Actor::OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType ) +{ + switch( animationType ) + { + case Animation::TO: + case Animation::BETWEEN: { - value = GetCurrentAnchorPoint().x; - break; - } + switch( index ) + { + case Dali::Actor::Property::SIZE: + { + if( value.Get( mTargetSize ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::ANCHOR_POINT_Y: - { - value = GetCurrentAnchorPoint().y; - break; - } + case Dali::Actor::Property::SIZE_WIDTH: + { + if( value.Get( mTargetSize.width ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::ANCHOR_POINT_Z: - { - value = GetCurrentAnchorPoint().z; - break; - } + case Dali::Actor::Property::SIZE_HEIGHT: + { + if( value.Get( mTargetSize.height ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::SIZE: - { - value = GetTargetSize(); - break; - } + case Dali::Actor::Property::SIZE_DEPTH: + { + if( value.Get( mTargetSize.depth ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::SIZE_WIDTH: - { - value = GetTargetSize().width; - break; - } + case Dali::Actor::Property::POSITION: + { + value.Get( mTargetPosition ); + break; + } - case Dali::Actor::Property::SIZE_HEIGHT: - { - value = GetTargetSize().height; - break; - } + case Dali::Actor::Property::POSITION_X: + { + value.Get( mTargetPosition.x ); + break; + } - case Dali::Actor::Property::SIZE_DEPTH: - { - value = GetTargetSize().depth; - break; - } + case Dali::Actor::Property::POSITION_Y: + { + value.Get( mTargetPosition.y ); + break; + } - case Dali::Actor::Property::POSITION: - { - value = GetTargetPosition(); - break; - } + case Dali::Actor::Property::POSITION_Z: + { + value.Get( mTargetPosition.z ); + break; + } - case Dali::Actor::Property::POSITION_X: - { - value = GetTargetPosition().x; - break; - } + case Dali::Actor::Property::ORIENTATION: + { + value.Get( mTargetOrientation ); + break; + } - case Dali::Actor::Property::POSITION_Y: - { - value = GetTargetPosition().y; - break; - } + case Dali::Actor::Property::SCALE: + { + value.Get( mTargetScale ); + break; + } - case Dali::Actor::Property::POSITION_Z: - { - value = GetTargetPosition().z; - break; - } + case Dali::Actor::Property::SCALE_X: + { + value.Get( mTargetScale.x ); + break; + } - case Dali::Actor::Property::WORLD_POSITION: - { - value = GetCurrentWorldPosition(); - break; - } + case Dali::Actor::Property::SCALE_Y: + { + value.Get( mTargetScale.y ); + break; + } - case Dali::Actor::Property::WORLD_POSITION_X: - { - value = GetCurrentWorldPosition().x; - break; - } + case Dali::Actor::Property::SCALE_Z: + { + value.Get( mTargetScale.z ); + break; + } - case Dali::Actor::Property::WORLD_POSITION_Y: - { - value = GetCurrentWorldPosition().y; - break; - } + case Dali::Actor::Property::VISIBLE: + { + SetVisibleInternal( value.Get< bool >(), SendMessage::FALSE ); + break; + } - case Dali::Actor::Property::WORLD_POSITION_Z: - { - value = GetCurrentWorldPosition().z; - break; - } + case Dali::Actor::Property::COLOR: + { + value.Get( mTargetColor ); + break; + } - case Dali::Actor::Property::ORIENTATION: - { - value = GetCurrentOrientation(); - break; - } + case Dali::Actor::Property::COLOR_RED: + { + value.Get( mTargetColor.r ); + break; + } - case Dali::Actor::Property::WORLD_ORIENTATION: - { - value = GetCurrentWorldOrientation(); - break; - } + case Dali::Actor::Property::COLOR_GREEN: + { + value.Get( mTargetColor.g ); + break; + } - case Dali::Actor::Property::SCALE: - { - value = GetCurrentScale(); - break; - } + case Dali::Actor::Property::COLOR_BLUE: + { + value.Get( mTargetColor.b ); + break; + } - case Dali::Actor::Property::SCALE_X: - { - value = GetCurrentScale().x; - break; - } + case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: + { + value.Get( mTargetColor.a ); + break; + } - case Dali::Actor::Property::SCALE_Y: - { - value = GetCurrentScale().y; + default: + { + // Not an animatable property. Do nothing. + break; + } + } break; } - case Dali::Actor::Property::SCALE_Z: + case Animation::BY: { - value = GetCurrentScale().z; - break; - } + switch( index ) + { + case Dali::Actor::Property::SIZE: + { + if( AdjustValue< Vector3 >( mTargetSize, value ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::WORLD_SCALE: - { - value = GetCurrentWorldScale(); - break; - } - - case Dali::Actor::Property::VISIBLE: - { - value = IsVisible(); - break; - } - - case Dali::Actor::Property::COLOR: - { - value = GetCurrentColor(); - break; - } - - case Dali::Actor::Property::COLOR_RED: - { - value = GetCurrentColor().r; - break; - } - - case Dali::Actor::Property::COLOR_GREEN: - { - value = GetCurrentColor().g; - break; - } - - case Dali::Actor::Property::COLOR_BLUE: - { - value = GetCurrentColor().b; - break; - } - - case Dali::Actor::Property::COLOR_ALPHA: - { - value = GetCurrentColor().a; - break; - } - - case Dali::Actor::Property::WORLD_COLOR: - { - value = GetCurrentWorldColor(); - break; - } - - case Dali::Actor::Property::WORLD_MATRIX: - { - value = GetCurrentWorldMatrix(); - break; - } - - case Dali::Actor::Property::NAME: - { - value = GetName(); - break; - } + case Dali::Actor::Property::SIZE_WIDTH: + { + if( AdjustValue< float >( mTargetSize.width, value ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::SENSITIVE: - { - value = IsSensitive(); - break; - } + case Dali::Actor::Property::SIZE_HEIGHT: + { + if( AdjustValue< float >( mTargetSize.height, value ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::LEAVE_REQUIRED: - { - value = GetLeaveRequired(); - break; - } + case Dali::Actor::Property::SIZE_DEPTH: + { + if( AdjustValue< float >( mTargetSize.depth, value ) ) + { + // Notify deriving classes + OnSizeAnimation( animation, mTargetSize ); + } + break; + } - case Dali::Actor::Property::INHERIT_POSITION: - { - value = IsPositionInherited(); - break; - } + case Dali::Actor::Property::POSITION: + { + AdjustValue< Vector3 >( mTargetPosition, value ); + break; + } - case Dali::Actor::Property::INHERIT_ORIENTATION: - { - value = IsOrientationInherited(); - break; - } + case Dali::Actor::Property::POSITION_X: + { + AdjustValue< float >( mTargetPosition.x, value ); + break; + } - case Dali::Actor::Property::INHERIT_SCALE: - { - value = IsScaleInherited(); - break; - } + case Dali::Actor::Property::POSITION_Y: + { + AdjustValue< float >( mTargetPosition.y, value ); + break; + } - case Dali::Actor::Property::COLOR_MODE: - { - value = Scripting::GetColorMode( GetColorMode() ); - break; - } + case Dali::Actor::Property::POSITION_Z: + { + AdjustValue< float >( mTargetPosition.z, value ); + break; + } - case Dali::Actor::Property::POSITION_INHERITANCE: - { - value = Scripting::GetPositionInheritanceMode( GetPositionInheritanceMode() ); - break; - } + case Dali::Actor::Property::ORIENTATION: + { + Quaternion relativeValue; + if( value.Get( relativeValue ) ) + { + mTargetOrientation *= relativeValue; + } + break; + } - case Dali::Actor::Property::DRAW_MODE: - { - value = Scripting::GetDrawMode( GetDrawMode() ); - break; - } + case Dali::Actor::Property::SCALE: + { + AdjustValue< Vector3 >( mTargetScale, value ); + break; + } - case Dali::Actor::Property::SIZE_MODE_FACTOR: - { - value = GetSizeModeFactor(); - break; - } + case Dali::Actor::Property::SCALE_X: + { + AdjustValue< float >( mTargetScale.x, value ); + break; + } - case Dali::Actor::Property::WIDTH_RESIZE_POLICY: - { - value = Scripting::GetLinearEnumerationName< ResizePolicy::Type >( GetResizePolicy( Dimension::WIDTH ), ResizePolicy::TypeTable, ResizePolicy::TypeTableCount ); - break; - } + case Dali::Actor::Property::SCALE_Y: + { + AdjustValue< float >( mTargetScale.y, value ); + break; + } - case Dali::Actor::Property::HEIGHT_RESIZE_POLICY: - { - value = Scripting::GetLinearEnumerationName< ResizePolicy::Type >( GetResizePolicy( Dimension::HEIGHT ), ResizePolicy::TypeTable, ResizePolicy::TypeTableCount ); - break; - } + case Dali::Actor::Property::SCALE_Z: + { + AdjustValue< float >( mTargetScale.z, value ); + break; + } - case Dali::Actor::Property::SIZE_SCALE_POLICY: - { - value = Scripting::GetLinearEnumerationName< SizeScalePolicy::Type >( GetSizeScalePolicy(), SizeScalePolicy::TypeTable, SizeScalePolicy::TypeTableCount ); - break; - } + case Dali::Actor::Property::VISIBLE: + { + bool relativeValue = false; + if( value.Get( relativeValue ) ) + { + bool visible = mVisible || relativeValue; + SetVisibleInternal( visible, SendMessage::FALSE ); + } + break; + } - case Dali::Actor::Property::WIDTH_FOR_HEIGHT: - { - value = ( GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::DIMENSION_DEPENDENCY ) && ( GetDimensionDependency( Dimension::WIDTH ) == Dimension::HEIGHT ); - break; - } + case Dali::Actor::Property::COLOR: + { + AdjustValue< Vector4 >( mTargetColor, value ); + break; + } - case Dali::Actor::Property::HEIGHT_FOR_WIDTH: - { - value = ( GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::DIMENSION_DEPENDENCY ) && ( GetDimensionDependency( Dimension::HEIGHT ) == Dimension::WIDTH ); - break; - } + case Dali::Actor::Property::COLOR_RED: + { + AdjustValue< float >( mTargetColor.r, value ); + break; + } - case Dali::Actor::Property::PADDING: - { - Vector2 widthPadding = GetPadding( Dimension::WIDTH ); - Vector2 heightPadding = GetPadding( Dimension::HEIGHT ); - value = Vector4( widthPadding.x, widthPadding.y, heightPadding.x, heightPadding.y ); - break; - } + case Dali::Actor::Property::COLOR_GREEN: + { + AdjustValue< float >( mTargetColor.g, value ); + break; + } - case Dali::Actor::Property::MINIMUM_SIZE: - { - value = Vector2( GetMinimumSize( Dimension::WIDTH ), GetMinimumSize( Dimension::HEIGHT ) ); - break; - } + case Dali::Actor::Property::COLOR_BLUE: + { + AdjustValue< float >( mTargetColor.b, value ); + break; + } - case Dali::Actor::Property::MAXIMUM_SIZE: - { - value = Vector2( GetMaximumSize( Dimension::WIDTH ), GetMaximumSize( Dimension::HEIGHT ) ); - break; - } + case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: + { + AdjustValue< float >( mTargetColor.a, value ); + break; + } - default: - { - DALI_ASSERT_ALWAYS( false && "Actor Property index invalid" ); // should not come here + default: + { + // Not an animatable property. Do nothing. + break; + } + } break; } } - - return value; } const SceneGraph::PropertyOwner* Actor::GetPropertyOwner() const @@ -3115,7 +3429,8 @@ const PropertyBase* Actor::GetSceneObjectAnimatableProperty( Property::Index ind property = animatable->GetSceneGraphProperty(); } - else if ( index >= DEFAULT_PROPERTY_MAX_COUNT ) + else if ( ( index >= CHILD_PROPERTY_REGISTRATION_START_INDEX ) && // Child properties are also stored as custom properties + ( index <= PROPERTY_CUSTOM_MAX_INDEX ) ) { CustomPropertyMetadata* custom = FindCustomProperty( index ); DALI_ASSERT_ALWAYS( custom && "Property index is invalid" ); @@ -3199,6 +3514,7 @@ const PropertyBase* Actor::GetSceneObjectAnimatableProperty( Property::Index ind break; case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: property = &mNode->mColor; break; @@ -3227,7 +3543,8 @@ const PropertyInputImpl* Actor::GetSceneObjectInputProperty( Property::Index ind property = animatable->GetSceneGraphProperty(); } - else if ( index >= DEFAULT_PROPERTY_MAX_COUNT ) + else if ( ( index >= CHILD_PROPERTY_REGISTRATION_START_INDEX ) && // Child properties are also stored as custom properties + ( index <= PROPERTY_CUSTOM_MAX_INDEX ) ) { CustomPropertyMetadata* custom = FindCustomProperty( index ); DALI_ASSERT_ALWAYS( custom && "Property index is invalid" ); @@ -3366,8 +3683,11 @@ const PropertyInputImpl* Actor::GetSceneObjectInputProperty( Property::Index ind break; case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: + { property = &mNode->mColor; break; + } case Dali::Actor::Property::WORLD_COLOR: property = &mNode->mWorldColor; @@ -3439,6 +3759,7 @@ int Actor::GetPropertyComponentIndex( Property::Index index ) const } case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: { componentIndex = 3; break; @@ -3469,6 +3790,9 @@ void Actor::SetParent( Actor* parent ) // Instruct each actor to create a corresponding node in the scene graph ConnectToStage( parent->GetHierarchyDepth() ); } + + // Resolve the name and index for the child properties if any + ResolveChildProperties(); } else // parent being set to NULL { @@ -3476,48 +3800,554 @@ void Actor::SetParent( Actor* parent ) mParent = NULL; - if ( EventThreadServices::IsCoreRunning() && // Don't emit signals or send messages during Core destruction - OnStage() ) + if ( EventThreadServices::IsCoreRunning() && // Don't emit signals or send messages during Core destruction + OnStage() ) + { + DALI_ASSERT_ALWAYS( mNode != NULL ); + + if( NULL != mNode ) + { + // Disconnect the Node & its children from the scene-graph. + DisconnectNodeMessage( GetEventThreadServices().GetUpdateManager(), *mNode ); + } + + // Instruct each actor to discard pointers to the scene-graph + DisconnectFromStage(); + } + } +} + +SceneGraph::Node* Actor::CreateNode() const +{ + return Node::New(); +} + +bool Actor::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& /* attributes */ ) +{ + bool done = false; + Actor* actor = dynamic_cast< Actor* >( object ); + + if( actor ) + { + if( 0 == actionName.compare( ACTION_SHOW ) ) + { + actor->SetVisible( true ); + done = true; + } + else if( 0 == actionName.compare( ACTION_HIDE ) ) + { + actor->SetVisible( false ); + done = true; + } + } + + return done; +} + +bool Actor::GetCachedPropertyValue( Property::Index index, Property::Value& value ) const +{ + bool valueSet = true; + + switch( index ) + { + case Dali::Actor::Property::PARENT_ORIGIN: + { + value = GetCurrentParentOrigin(); + break; + } + + case Dali::Actor::Property::PARENT_ORIGIN_X: + { + value = GetCurrentParentOrigin().x; + break; + } + + case Dali::Actor::Property::PARENT_ORIGIN_Y: + { + value = GetCurrentParentOrigin().y; + break; + } + + case Dali::Actor::Property::PARENT_ORIGIN_Z: + { + value = GetCurrentParentOrigin().z; + break; + } + + case Dali::Actor::Property::ANCHOR_POINT: + { + value = GetCurrentAnchorPoint(); + break; + } + + case Dali::Actor::Property::ANCHOR_POINT_X: + { + value = GetCurrentAnchorPoint().x; + break; + } + + case Dali::Actor::Property::ANCHOR_POINT_Y: + { + value = GetCurrentAnchorPoint().y; + break; + } + + case Dali::Actor::Property::ANCHOR_POINT_Z: + { + value = GetCurrentAnchorPoint().z; + break; + } + + case Dali::Actor::Property::SIZE: + { + value = GetTargetSize(); + break; + } + + case Dali::Actor::Property::SIZE_WIDTH: + { + value = GetTargetSize().width; + break; + } + + case Dali::Actor::Property::SIZE_HEIGHT: + { + value = GetTargetSize().height; + break; + } + + case Dali::Actor::Property::SIZE_DEPTH: + { + value = GetTargetSize().depth; + break; + } + + case Dali::Actor::Property::POSITION: + { + value = GetTargetPosition(); + break; + } + + case Dali::Actor::Property::POSITION_X: + { + value = GetTargetPosition().x; + break; + } + + case Dali::Actor::Property::POSITION_Y: + { + value = GetTargetPosition().y; + break; + } + + case Dali::Actor::Property::POSITION_Z: + { + value = GetTargetPosition().z; + break; + } + + case Dali::Actor::Property::ORIENTATION: + { + value = mTargetOrientation; + break; + } + + case Dali::Actor::Property::SCALE: + { + value = mTargetScale; + break; + } + + case Dali::Actor::Property::SCALE_X: + { + value = mTargetScale.x; + break; + } + + case Dali::Actor::Property::SCALE_Y: + { + value = mTargetScale.y; + break; + } + + case Dali::Actor::Property::SCALE_Z: + { + value = mTargetScale.z; + break; + } + + case Dali::Actor::Property::VISIBLE: + { + value = mVisible; + break; + } + + case Dali::Actor::Property::COLOR: + { + value = mTargetColor; + break; + } + + case Dali::Actor::Property::COLOR_RED: + { + value = mTargetColor.r; + break; + } + + case Dali::Actor::Property::COLOR_GREEN: + { + value = mTargetColor.g; + break; + } + + case Dali::Actor::Property::COLOR_BLUE: + { + value = mTargetColor.b; + break; + } + + case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: + { + value = mTargetColor.a; + break; + } + + case Dali::Actor::Property::NAME: + { + value = GetName(); + break; + } + + case Dali::Actor::Property::SENSITIVE: + { + value = IsSensitive(); + break; + } + + case Dali::Actor::Property::LEAVE_REQUIRED: + { + value = GetLeaveRequired(); + break; + } + + case Dali::Actor::Property::INHERIT_POSITION: + { + value = IsPositionInherited(); + break; + } + + case Dali::Actor::Property::INHERIT_ORIENTATION: + { + value = IsOrientationInherited(); + break; + } + + case Dali::Actor::Property::INHERIT_SCALE: + { + value = IsScaleInherited(); + break; + } + + case Dali::Actor::Property::COLOR_MODE: + { + value = Scripting::GetLinearEnumerationName< ColorMode >( GetColorMode(), COLOR_MODE_TABLE, COLOR_MODE_TABLE_COUNT ); + break; + } + + case Dali::Actor::Property::POSITION_INHERITANCE: + { + value = Scripting::GetLinearEnumerationName< PositionInheritanceMode >( GetPositionInheritanceMode(), POSITION_INHERITANCE_MODE_TABLE, POSITION_INHERITANCE_MODE_TABLE_COUNT ); + break; + } + + case Dali::Actor::Property::DRAW_MODE: + { + value = Scripting::GetEnumerationName< DrawMode::Type >( GetDrawMode(), DRAW_MODE_TABLE, DRAW_MODE_TABLE_COUNT ); + break; + } + + case Dali::Actor::Property::SIZE_MODE_FACTOR: + { + value = GetSizeModeFactor(); + break; + } + + case Dali::Actor::Property::WIDTH_RESIZE_POLICY: + { + value = Scripting::GetLinearEnumerationName< ResizePolicy::Type >( GetResizePolicy( Dimension::WIDTH ), RESIZE_POLICY_TABLE, RESIZE_POLICY_TABLE_COUNT ); + break; + } + + case Dali::Actor::Property::HEIGHT_RESIZE_POLICY: + { + value = Scripting::GetLinearEnumerationName< ResizePolicy::Type >( GetResizePolicy( Dimension::HEIGHT ), RESIZE_POLICY_TABLE, RESIZE_POLICY_TABLE_COUNT ); + break; + } + + case Dali::Actor::Property::SIZE_SCALE_POLICY: + { + value = Scripting::GetLinearEnumerationName< SizeScalePolicy::Type >( GetSizeScalePolicy(), SIZE_SCALE_POLICY_TABLE, SIZE_SCALE_POLICY_TABLE_COUNT ); + break; + } + + case Dali::Actor::Property::WIDTH_FOR_HEIGHT: + { + value = ( GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::DIMENSION_DEPENDENCY ) && ( GetDimensionDependency( Dimension::WIDTH ) == Dimension::HEIGHT ); + break; + } + + case Dali::Actor::Property::HEIGHT_FOR_WIDTH: + { + value = ( GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::DIMENSION_DEPENDENCY ) && ( GetDimensionDependency( Dimension::HEIGHT ) == Dimension::WIDTH ); + break; + } + + case Dali::Actor::Property::PADDING: + { + Vector2 widthPadding = GetPadding( Dimension::WIDTH ); + Vector2 heightPadding = GetPadding( Dimension::HEIGHT ); + value = Vector4( widthPadding.x, widthPadding.y, heightPadding.x, heightPadding.y ); + break; + } + + case Dali::Actor::Property::MINIMUM_SIZE: + { + value = Vector2( GetMinimumSize( Dimension::WIDTH ), GetMinimumSize( Dimension::HEIGHT ) ); + break; + } + + case Dali::Actor::Property::MAXIMUM_SIZE: + { + value = Vector2( GetMaximumSize( Dimension::WIDTH ), GetMaximumSize( Dimension::HEIGHT ) ); + break; + } + + case Dali::Actor::Property::CLIPPING_MODE: + { + value = mClippingMode; + break; + } + + case Dali::DevelActor::Property::SIBLING_ORDER: + { + value = static_cast( GetSiblingOrder() ); + break; + } + + case Dali::DevelActor::Property::SCREEN_POSITION: + { + value = GetCurrentScreenPosition(); + break; + } + + case Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT: + { + value = mPositionUsesAnchorPoint; + break; + } + + case Dali::Actor::Property::LAYOUT_DIRECTION: + { + value = mLayoutDirection; + break; + } + + case Dali::Actor::Property::INHERIT_LAYOUT_DIRECTION: + { + value = IsLayoutDirectionInherited(); + break; + } + + default: + { + // Must be a scene-graph only property + valueSet = false; + break; + } + } + + return valueSet; +} + +bool Actor::GetCurrentPropertyValue( Property::Index index, Property::Value& value ) const +{ + bool valueSet = true; + + switch( index ) + { + case Dali::Actor::Property::SIZE: + { + value = GetCurrentSize(); + break; + } + + case Dali::Actor::Property::SIZE_WIDTH: + { + value = GetCurrentSize().width; + break; + } + + case Dali::Actor::Property::SIZE_HEIGHT: + { + value = GetCurrentSize().height; + break; + } + + case Dali::Actor::Property::SIZE_DEPTH: + { + value = GetCurrentSize().depth; + break; + } + + case Dali::Actor::Property::POSITION: + { + value = GetCurrentPosition(); + break; + } + + case Dali::Actor::Property::POSITION_X: + { + value = GetCurrentPosition().x; + break; + } + + case Dali::Actor::Property::POSITION_Y: + { + value = GetCurrentPosition().y; + break; + } + + case Dali::Actor::Property::POSITION_Z: + { + value = GetCurrentPosition().z; + break; + } + + case Dali::Actor::Property::WORLD_POSITION: + { + value = GetCurrentWorldPosition(); + break; + } + + case Dali::Actor::Property::WORLD_POSITION_X: + { + value = GetCurrentWorldPosition().x; + break; + } + + case Dali::Actor::Property::WORLD_POSITION_Y: + { + value = GetCurrentWorldPosition().y; + break; + } + + case Dali::Actor::Property::WORLD_POSITION_Z: + { + value = GetCurrentWorldPosition().z; + break; + } + + case Dali::Actor::Property::ORIENTATION: + { + value = GetCurrentOrientation(); + break; + } + + case Dali::Actor::Property::WORLD_ORIENTATION: + { + value = GetCurrentWorldOrientation(); + break; + } + + case Dali::Actor::Property::SCALE: + { + value = GetCurrentScale(); + break; + } + + case Dali::Actor::Property::SCALE_X: + { + value = GetCurrentScale().x; + break; + } + + case Dali::Actor::Property::SCALE_Y: + { + value = GetCurrentScale().y; + break; + } + + case Dali::Actor::Property::SCALE_Z: + { + value = GetCurrentScale().z; + break; + } + + case Dali::Actor::Property::WORLD_SCALE: + { + value = GetCurrentWorldScale(); + break; + } + + case Dali::Actor::Property::COLOR: + { + value = GetCurrentColor(); + break; + } + + case Dali::Actor::Property::COLOR_RED: + { + value = GetCurrentColor().r; + break; + } + + case Dali::Actor::Property::COLOR_GREEN: { - DALI_ASSERT_ALWAYS( mNode != NULL ); + value = GetCurrentColor().g; + break; + } - if( NULL != mNode ) - { - // Disconnect the Node & its children from the scene-graph. - DisconnectNodeMessage( GetEventThreadServices().GetUpdateManager(), *mNode ); - } + case Dali::Actor::Property::COLOR_BLUE: + { + value = GetCurrentColor().b; + break; + } - // Instruct each actor to discard pointers to the scene-graph - DisconnectFromStage(); + case Dali::Actor::Property::COLOR_ALPHA: + case Dali::DevelActor::Property::OPACITY: + { + value = GetCurrentColor().a; + break; } - } -} -SceneGraph::Node* Actor::CreateNode() const -{ - return Node::New(); -} + case Dali::Actor::Property::WORLD_COLOR: + { + value = GetCurrentWorldColor(); + break; + } -bool Actor::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& /* attributes */ ) -{ - bool done = false; - Actor* actor = dynamic_cast< Actor* >( object ); + case Dali::Actor::Property::WORLD_MATRIX: + { + value = GetCurrentWorldMatrix(); + break; + } - if( actor ) - { - if( 0 == actionName.compare( ACTION_SHOW ) ) + case Dali::Actor::Property::VISIBLE: { - actor->SetVisible( true ); - done = true; + value = IsVisible(); + break; } - else if( 0 == actionName.compare( ACTION_HIDE ) ) + + default: { - actor->SetVisible( false ); - done = true; + // Must be an event-side only property + valueSet = false; + break; } } - return done; + return valueSet; } void Actor::EnsureRelayoutData() @@ -3803,7 +4633,7 @@ float Actor::NegotiateFromChildren( Dimension::Type dimension ) float Actor::GetSize( Dimension::Type dimension ) const { - return GetDimensionValue( GetTargetSize(), dimension ); + return GetDimensionValue( mTargetSize, dimension ); } float Actor::GetNaturalSize( Dimension::Type dimension ) const @@ -3969,7 +4799,7 @@ void Actor::NegotiateDimensions( const Vector2& allocatedSize ) } } -Vector2 Actor::ApplySizeSetPolicy( const Vector2 size ) +Vector2 Actor::ApplySizeSetPolicy( const Vector2& size ) { switch( mRelayoutData->sizeSetPolicy ) { @@ -4066,6 +4896,24 @@ void Actor::SetNegotiatedSize( RelayoutContainer& container ) void Actor::NegotiateSize( const Vector2& allocatedSize, RelayoutContainer& container ) { + // Force a size negotiation for actors that has assigned size during relayout + // This is required as otherwise the flags that force a relayout will not + // necessarilly be set. This will occur if the actor has already been laid out. + // The dirty flags are then cleared. Then if the actor is added back into the + // relayout container afterwards, the dirty flags would still be clear... + // causing a relayout to be skipped. Here we force any actors added to the + // container to be relayed out. + DALI_LOG_TIMER_START( NegSizeTimer1 ); + + if( GetUseAssignedSize(Dimension::WIDTH ) ) + { + SetLayoutNegotiated( false, Dimension::WIDTH ); + } + if( GetUseAssignedSize( Dimension::HEIGHT ) ) + { + SetLayoutNegotiated( false, Dimension::HEIGHT ); + } + // Do the negotiation NegotiateDimensions( allocatedSize ); @@ -4073,18 +4921,62 @@ void Actor::NegotiateSize( const Vector2& allocatedSize, RelayoutContainer& cont SetNegotiatedSize( container ); // Negotiate down to children - const Vector2 newBounds = GetTargetSize().GetVectorXY(); - for( unsigned int i = 0, count = GetChildCount(); i < count; ++i ) { ActorPtr child = GetChildAt( i ); + // Forces children that have already been laid out to be relayed out + // if they have assigned size during relayout. + if( child->GetUseAssignedSize(Dimension::WIDTH) ) + { + child->SetLayoutNegotiated(false, Dimension::WIDTH); + child->SetLayoutDirty(true, Dimension::WIDTH); + } + + if( child->GetUseAssignedSize(Dimension::HEIGHT) ) + { + child->SetLayoutNegotiated(false, Dimension::HEIGHT); + child->SetLayoutDirty(true, Dimension::HEIGHT); + } + // Only relayout if required if( child->RelayoutRequired() ) { - container.Add( Dali::Actor( child.Get() ), newBounds ); + container.Add( Dali::Actor( child.Get() ), mTargetSize.GetVectorXY() ); + } + } + DALI_LOG_TIMER_END( NegSizeTimer1, gLogRelayoutFilter, Debug::Concise, "NegotiateSize() took: "); +} + +void Actor::SetUseAssignedSize( bool use, Dimension::Type dimension ) +{ + if( mRelayoutData ) + { + for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i ) + { + if( dimension & ( 1 << i ) ) + { + mRelayoutData->useAssignedSize[ i ] = use; + } + } + } +} + +bool Actor::GetUseAssignedSize( Dimension::Type dimension ) const +{ + if ( mRelayoutData ) + { + // If more than one dimension is requested, just return the first one found + for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i ) + { + if( dimension & ( 1 << i ) ) + { + return mRelayoutData->useAssignedSize[ i ]; + } } } + + return false; } void Actor::RelayoutRequest( Dimension::Type dimension ) @@ -4196,6 +5088,287 @@ float Actor::GetMaximumSize( Dimension::Type dimension ) const return FLT_MAX; // Default } +Object* Actor::GetParentObject() const +{ + return mParent; +} + +void Actor::SetVisibleInternal( bool visible, SendMessage::Type sendMessage ) +{ + if( mVisible != visible ) + { + if( sendMessage == SendMessage::TRUE && NULL != mNode ) + { + // mNode is being used in a separate thread; queue a message to set the value & base value + SceneGraph::NodePropertyMessage::Send( GetEventThreadServices(), mNode, &mNode->mVisible, &AnimatableProperty::Bake, visible ); + } + + mVisible = visible; + + // Emit the signal on this actor and all its children + EmitVisibilityChangedSignalRecursively( this, visible, DevelActor::VisibilityChange::SELF ); + } +} + +void Actor::SetSiblingOrder( unsigned int order ) +{ + if ( mParent ) + { + ActorContainer& siblings = *(mParent->mChildren); + unsigned int currentOrder = GetSiblingOrder(); + + if( order != currentOrder ) + { + if( order == 0 ) + { + LowerToBottom(); + } + else if( order < siblings.size() -1 ) + { + if( order > currentOrder ) + { + RaiseAbove( *siblings[order] ); + } + else + { + LowerBelow( *siblings[order] ); + } + } + else + { + RaiseToTop(); + } + } + } +} + +unsigned int Actor::GetSiblingOrder() const +{ + unsigned int order = 0; + + if ( mParent ) + { + ActorContainer& siblings = *(mParent->mChildren); + for( size_t i=0; iRequestRebuildDepthTree(); + } + } +} + +void Actor::Raise() +{ + if ( mParent ) + { + ActorContainer& siblings = *(mParent->mChildren); + if( siblings.back() != this ) // If not already at end + { + for( size_t i=0; imChildren); + if( siblings.front() != this ) // If not already at beginning + { + for( size_t i=1; imChildren); + if( siblings.back() != this ) // If not already at end + { + ActorContainer::iterator iter = std::find( siblings.begin(), siblings.end(), this ); + if( iter != siblings.end() ) + { + siblings.erase(iter); + siblings.push_back(ActorPtr(this)); + } + } + RequestRebuildDepthTree(); + } + else + { + DALI_LOG_WARNING( "Actor must have a parent, Sibling order not changed.\n" ); + } +} + +void Actor::LowerToBottom() +{ + if ( mParent ) + { + ActorContainer& siblings = *(mParent->mChildren); + if( siblings.front() != this ) // If not already at bottom, + { + ActorPtr thisPtr(this); // ensure this actor remains referenced. + + ActorContainer::iterator iter = std::find( siblings.begin(), siblings.end(), this ); + if( iter != siblings.end() ) + { + siblings.erase(iter); + siblings.insert(siblings.begin(), thisPtr); + } + } + RequestRebuildDepthTree(); + } + else + { + DALI_LOG_WARNING( "Actor must have a parent, Sibling order not changed.\n" ); + } +} + +void Actor::RaiseAbove( Internal::Actor& target ) +{ + if ( mParent ) + { + ActorContainer& siblings = *(mParent->mChildren); + if( siblings.back() != this && target.mParent == mParent ) // If not already at top + { + ActorPtr thisPtr(this); // ensure this actor remains referenced. + + ActorContainer::iterator targetIter = std::find( siblings.begin(), siblings.end(), &target ); + ActorContainer::iterator thisIter = std::find( siblings.begin(), siblings.end(), this ); + if( thisIter < targetIter ) + { + siblings.erase(thisIter); + // Erasing early invalidates the targetIter. (Conversely, inserting first may also + // invalidate thisIter) + targetIter = std::find( siblings.begin(), siblings.end(), &target ); + ++targetIter; + siblings.insert(targetIter, thisPtr); + } + RequestRebuildDepthTree(); + } + } + else + { + DALI_LOG_WARNING( "Actor must have a parent, Sibling order not changed.\n" ); + } +} + +void Actor::LowerBelow( Internal::Actor& target ) +{ + if ( mParent ) + { + ActorContainer& siblings = *(mParent->mChildren); + if( siblings.front() != this && target.mParent == mParent ) // If not already at bottom + { + ActorPtr thisPtr(this); // ensure this actor remains referenced. + + ActorContainer::iterator targetIter = std::find( siblings.begin(), siblings.end(), &target ); + ActorContainer::iterator thisIter = std::find( siblings.begin(), siblings.end(), this ); + + if( thisIter > targetIter ) + { + siblings.erase(thisIter); // this only invalidates iterators at or after this point. + siblings.insert(targetIter, thisPtr); + } + RequestRebuildDepthTree(); + } + } + else + { + DALI_LOG_WARNING( "Actor must have a parent, Sibling order not changed.\n" ); + } +} + +void Actor::SetInheritLayoutDirection( bool inherit ) +{ + if( mInheritLayoutDirection != inherit ) + { + mInheritLayoutDirection = inherit; + + if( inherit && mParent ) + { + InheritLayoutDirectionRecursively( this, mParent->mLayoutDirection ); + } + } +} + +bool Actor::IsLayoutDirectionInherited() const +{ + return mInheritLayoutDirection; +} + +void Actor::InheritLayoutDirectionRecursively( ActorPtr actor, Dali::LayoutDirection::Type direction, bool set ) +{ + if( actor && ( actor->mInheritLayoutDirection || set ) ) + { + if( actor->mLayoutDirection != direction) + { + actor->mLayoutDirection = direction; + actor->EmitLayoutDirectionChangedSignal( direction ); + actor->RelayoutRequest(); + } + + if( actor->GetChildCount() > 0 ) + { + ActorContainer& children = actor->GetChildrenInternal(); + for( ActorIter iter = children.begin(), endIter = children.end(); iter != endIter; ++iter ) + { + InheritLayoutDirectionRecursively( *iter, direction ); + } + } + } +} + } // namespace Internal } // namespace Dali