Button SetLabel padding fix

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 28b9d4a..ff395ae 100644 (file)
--- 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();
   }