From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 4 May 2015 08:12:17 +0000 (+0900)
Subject: Set label padding in case of ResizePolicy::USE_NATURAL_SIZE
X-Git-Tag: accepted/tizen/common/20150512.125104~4^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=b47edc5194cfda5060ae4594f747b2770da2f98f

Set label padding in case of ResizePolicy::USE_NATURAL_SIZE
   - we don't need a padding in other resize policies.

Change-Id: Icec860efd36a1115a9461ecb10a09a46c0a850fc
---

diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index f07eb32..43ff434 100644
--- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@ -661,7 +661,21 @@ void PushButton::ConfigureSizeNegotiation()
 
   if( label )
   {
-    label.SetPadding( Padding( TEXT_PADDING, TEXT_PADDING, TEXT_PADDING, TEXT_PADDING) );
+    Padding padding;
+
+    if( label.GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::USE_NATURAL_SIZE )
+    {
+      padding.left = TEXT_PADDING;
+      padding.right = TEXT_PADDING;
+    }
+
+    if( label.GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::USE_NATURAL_SIZE )
+    {
+      padding.top = TEXT_PADDING;
+      padding.bottom = TEXT_PADDING;
+    }
+
+    label.SetPadding( padding );
   }
 }