From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 5 Aug 2016 13:29:21 +0000 (-0700)
Subject: Merge "Added GetNaturalSize to primitive visual." into devel/master
X-Git-Tag: dali_1.2.1~14
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c04a09f43cb4d1def43aff517e6f8053f8a96add;hp=19dfaca56bd409626a14b50d7d9cc22a958d93f4

Merge "Added GetNaturalSize to primitive visual." into devel/master
---

diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
index 4bba653..fe14601 100644
--- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
+++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
@@ -361,6 +361,12 @@ void PrimitiveVisual::SetSize( const Vector2& size )
   // ToDo: renderer responds to the size change
 }
 
+void PrimitiveVisual::GetNaturalSize( Vector2& naturalSize ) const
+{
+  naturalSize.x = mObjectDimensions.x;
+  naturalSize.y = mObjectDimensions.y;
+}
+
 void PrimitiveVisual::SetClipRect( const Rect<int>& clipRect )
 {
   Visual::Base::SetClipRect( clipRect );
diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.h b/dali-toolkit/internal/visuals/primitive/primitive-visual.h
index abf4a18..01b5885 100644
--- a/dali-toolkit/internal/visuals/primitive/primitive-visual.h
+++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.h
@@ -116,6 +116,11 @@ public:  // from Visual
   virtual void SetSize( const Vector2& size );
 
   /**
+   * @copydoc Visual::GetNaturalSize
+   */
+  virtual void GetNaturalSize( Vector2& naturalSize ) const;
+
+  /**
    * @copydoc Visual::SetClipRect
    */
   virtual void SetClipRect( const Rect<int>& clipRect );