Remove PropagateRelayoutFlags() from Actor 16/40016/2
authorXiangyin Ma <x1.ma@samsung.com>
Wed, 27 May 2015 15:26:30 +0000 (16:26 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 27 May 2015 17:05:14 +0000 (10:05 -0700)
Change-Id: Ia1fb8124c4ed75c6c351b2d68b9846e39bfbe16b

dali/internal/event/actors/actor-impl.cpp
dali/internal/event/actors/actor-impl.h
dali/public-api/actors/actor.cpp
dali/public-api/actors/actor.h

index 75ed2634cbf3f17c6fca746a9a311f8b7c6580d1..530a43b709f25ab8dc248ece0887b35475ee6d4d 100644 (file)
@@ -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 )
 {
 }
index b97bf4c8d9de4a5f36e00546d29c0215b963ce2e..8e7108d1bd78d8d1b7e858bfceb4e7a0dec69e23 100644 (file)
@@ -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
    *
index 50632e8ae77e3d090967468287aa59d2c54ef8c9..0cdc19affc227fe87512e7a3e55a382823a90dd4 100644 (file)
@@ -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);
index c96951fc817c3584e0c3602cc46d79025346cc6b..8a9cadd86678ec93537f78d61bbd5f2eed60e9c4 100644 (file)
@@ -1218,14 +1218,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
    *