X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=ff395aee9a715c80f08e2db64e18ba22aa8b4132;hb=refs%2Fchanges%2F84%2F44684%2F2;hp=28b9d4a65a00189a7827d43d8cdbac71c6bad975;hpb=06e563f8a982e25a0efe2d91c794657dc8e4bc4a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 28b9d4a..ff395ae 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -445,7 +445,7 @@ void Button::SetLabelText( const std::string& label )
       Self().Add( mLabel );
     }
 
-    OnLabelSet();
+    OnLabelSet( false );
 
     RelayoutRequest();
   }
@@ -1577,7 +1577,8 @@ void Button::SetLabel( Actor label )
     // label should be the top of the button
     Self().Add( mLabel );
 
-    OnLabelSet();
+    ResetImageLayers();
+    OnLabelSet( true );
 
     RelayoutRequest();
   }