From: Xiangyin Ma Date: Wed, 27 May 2015 15:26:30 +0000 (+0100) Subject: Remove PropagateRelayoutFlags() from Actor X-Git-Tag: accepted/tizen/common/20150529.134047~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F40016%2F2;p=platform%2Fcore%2Fuifw%2Fdali-core.git Remove PropagateRelayoutFlags() from Actor Change-Id: Ia1fb8124c4ed75c6c351b2d68b9846e39bfbe16b --- diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp index 75ed263..530a43b 100644 --- a/dali/internal/event/actors/actor-impl.cpp +++ b/dali/internal/event/actors/actor-impl.cpp @@ -4452,16 +4452,6 @@ void Actor::RelayoutRequest( Dimension::Type dimension ) } } -void Actor::PropagateRelayoutFlags() -{ - Internal::RelayoutController* relayoutController = Internal::RelayoutController::Get(); - if( relayoutController ) - { - Dali::Actor self( this ); - relayoutController->PropagateFlags( self ); - } -} - void Actor::OnCalculateRelayoutSize( Dimension::Type dimension ) { } diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h index b97bf4c..8e7108d 100644 --- a/dali/internal/event/actors/actor-impl.h +++ b/dali/internal/event/actors/actor-impl.h @@ -985,11 +985,6 @@ public: */ void RelayoutRequest( Dimension::Type dimension = Dimension::ALL_DIMENSIONS ); - /* - * @copydoc Dali::Actor::PropagateRelayoutFlags - */ - void PropagateRelayoutFlags(); - /** * @brief Determine if this actor is dependent on it's parent for relayout * diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp index 50632e8..0cdc19a 100644 --- a/dali/public-api/actors/actor.cpp +++ b/dali/public-api/actors/actor.cpp @@ -479,11 +479,6 @@ float Actor::GetRelayoutSize( Dimension::Type dimension ) const return GetImplementation(*this).GetRelayoutSize( dimension ); } -void Actor::PropagateRelayoutFlags() -{ - GetImplementation(*this).PropagateRelayoutFlags(); -} - void Actor::SetPadding( const Padding& padding ) { Internal::Actor& impl = GetImplementation(*this); diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index c96951f..8a9cadd 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -1219,14 +1219,6 @@ public: float GetRelayoutSize( Dimension::Type dimension ) const; /** - * @brief Force propagate relayout flags through the tree. This actor and all actors - * dependent on it will have their relayout flags reset. - * - * This is useful for resetting layout flags during the layout process. - */ - void PropagateRelayoutFlags(); - - /** * @brief Set the padding for use in layout * * @param[in] padding Padding for the actor