X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=46159edcf86272bce1c15a00f3e9795b7cc9142f;hp=9c30a7c3ffd5fcce826c3e3c332466b6224afe62;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hpb=a881757839b7abb008873a68c67e17b3ba39669b;ds=sidebyside

diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index 9c30a7c..46159ed 100644
--- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@ -28,6 +28,7 @@
 #include "push-button-default-painter-impl.h"
 
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
+#include <dali-toolkit/internal/controls/relayout-helper.h>
 
 namespace Dali
 {
@@ -82,12 +83,36 @@ namespace
 const unsigned int INITIAL_AUTOREPEATING_DELAY( 0.15f );
 const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f );
 
+const float TEXT_PADDING = 12.0f;
+
 // Helper function used to cast a ButtonPainter to PushButtonDefaultPainter
 PushButtonDefaultPainterPtr GetPushButtonPainter( Dali::Toolkit::Internal::ButtonPainterPtr painter )
 {
   return static_cast<PushButtonDefaultPainter*>( painter.Get() );
 }
 
+/**
+ * Find the first image actor in the actor hierarchy
+ */
+ImageActor FindImageActor( Actor root )
+{
+  ImageActor imageActor = ImageActor::DownCast( root );
+  if( !imageActor && root )
+  {
+    for( unsigned int i = 0, numChildren = root.GetChildCount(); i < numChildren; ++i )
+    {
+      ImageActor childImageActor = FindImageActor( root.GetChildAt( i ) );
+      if( childImageActor )
+      {
+        return childImageActor;
+      }
+    }
+  }
+
+  return imageActor;
+}
+
+
 } // unnamed namespace
 
 Dali::Toolkit::PushButton PushButton::New()
@@ -679,6 +704,69 @@ void PushButton::OnActivated()
   DoClickAction(attributes);
 }
 
+Vector3 PushButton::GetNaturalSize()
+{
+  Vector3 size = Control::GetNaturalSize();
+
+  const bool widthIsZero = EqualsZero( size.width );
+  const bool heightIsZero = EqualsZero( size.height );
+
+  if( widthIsZero || heightIsZero )
+  {
+    // If background and background not scale9 try get size from that
+    ImageActor imageActor = FindImageActor( mButtonImage );
+    if( imageActor && imageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+    {
+      Vector3 imageSize = RelayoutHelper::GetNaturalSize( imageActor );
+
+      if( widthIsZero )
+      {
+        size.width = imageSize.width;
+      }
+
+      if( heightIsZero )
+      {
+        size.height = imageSize.height;
+      }
+    }
+
+    ImageActor backgroundImageActor = FindImageActor( mBackgroundImage );
+    if( backgroundImageActor && backgroundImageActor.GetStyle() != ImageActor::STYLE_NINE_PATCH )
+    {
+      Vector3 imageSize = RelayoutHelper::GetNaturalSize( backgroundImageActor );
+
+      if( widthIsZero )
+      {
+        size.width = std::max( size.width, imageSize.width );
+      }
+
+      if( heightIsZero )
+      {
+        size.height = std::max( size.height, imageSize.height );
+      }
+    }
+
+    // If label, test against it's size
+    Toolkit::TextView textView = Toolkit::TextView::DownCast( mLabel );
+    if( textView )
+    {
+      Vector3 textViewSize = textView.GetNaturalSize();
+
+      if( widthIsZero )
+      {
+        size.width = std::max( size.width, textViewSize.width + TEXT_PADDING * 2.0f );
+      }
+
+      if( heightIsZero )
+      {
+        size.height = std::max( size.height, textViewSize.height + TEXT_PADDING * 2.0f );
+      }
+    }
+  }
+
+  return size;
+}
+
 void PushButton::DoClickAction(const PropertyValueContainer& attributes)
 {
   // Prevents the button signals from doing a recursive loop by sending an action