From 2f92933d2e1aa973d780f183fd42b04afdd802eb Mon Sep 17 00:00:00 2001 From: Andrew Poor Date: Thu, 4 Aug 2016 14:11:51 +0100 Subject: [PATCH] Added GetNaturalSize to primitive visual. Change-Id: I6ca214aadbefcc3921c65a9bfddcc10a18f55735 --- dali-toolkit/internal/visuals/primitive/primitive-visual.cpp | 6 ++++++ dali-toolkit/internal/visuals/primitive/primitive-visual.h | 5 +++++ 2 files changed, 11 insertions(+) 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& 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& clipRect ); -- 2.7.4