X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.h;h=a17d058c1ecd183694a1c15f7ae718657f79c6bc;hb=038597cefeb2d2d3632f8940af450ef44c0c32dc;hp=89f059159d00c7a2b3250d759a3e96fa2989adac;hpb=efc136204e9a4460a7a2421e673c873e23974a80;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.h b/dali-toolkit/internal/controls/buttons/button-impl.h
index 89f0591..a17d058 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/button-impl.h
@@ -578,45 +578,43 @@ private:
   void ResetImageLayers();
 
   /**
-   * Transitions in the actor, inserting the actor above childLower below the childUpper.
-   * Will not insert the actor if it is already attached to a parent (and so will not reorder the actor)
+   * Transitions out the actor
    */
-  void TransitionInBetween( Actor childLower, Actor childUpper, Actor actor );
+  void TransitionOut( Actor actor );
 
   /**
-   * Transitions in the actor, inserting the actor above the child if the child exists or at the bottom otherwise
-   * Will not insert the actor if it is already attached to a parent (and so will not reorder the actor)
+   * Removes the actor from the button and prepares it to be transitioned out
    */
-  void TransitionInAbove( Actor child, Actor actor );
+  void RemoveButtonImage( Actor& actor );
 
   /**
-   * Transitions in the actor, inserting the actor at the index
-   * Will not insert the actor if it is already attached to a parent (and so will not reorder the actor)
+   * Finds the index of the actor.
+   * If the actor doesn't exist, return the last index + 1.
    */
-  void TransitionInAtIndex( unsigned int index, Actor actor );
+  unsigned int FindChildIndex( Actor& actor );
 
   /**
-   * Transitions out the actor
+   * Adds an actor to the hierarchy and prepares it to be transitioned.
+   * @param[in] actor The actor to add
    */
-  void TransitionOut( Actor actor );
+  void PrepareAddButtonImage( Actor& actor );
 
   /**
-   * Inserts the actor to the button and prepares it to be transitioned out
-   * @return true if the child was inserted, false otherwise
+   * Adds an actor to the hierarchy and marks it to be transitioned.
+   * @param[in] actor The actor to add
    */
-  bool InsertButtonImage( unsigned int index, Actor& actor );
+  void TransitionButtonImage( Actor& actor );
 
   /**
-   * Removes the actor from the button and prepares it to be transitioned out
+   * Adds an actor to the hierarchy.
+   * @param[in] actor The actor to add
    */
-  void RemoveButtonImage( Actor& actor );
+  void AddButtonImage( Actor& actor );
 
   /**
-   * Finds the index of the actor.
-   * If the actor doesn't exist, return the last index + 1.
+   * (Re)Adds the label (if exists) to the hierarchy (so it is always on top).
    */
-  unsigned int FindChildIndex( Actor& actor );
-
+  void ReAddLabel();
 
   // Undefined
   Button( const Button& );