Merge "Added code for stylable transitions" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-base-impl.cpp

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index 922f561..48df29a 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@ -94,6 +94,11 @@ const Vector2& Visual::Base::GetSize() const
   return mImpl->mSize;
 }
 
   return mImpl->mSize;
 }
 

+float Visual::Base::GetHeightForWidth( float width ) const
+{
+  return 0.f;
+}
+

 void Visual::Base::GetNaturalSize( Vector2& naturalSize ) const
 {
   naturalSize = Vector2::ZERO;
 void Visual::Base::GetNaturalSize( Vector2& naturalSize ) const
 {
   naturalSize = Vector2::ZERO;


@@ -126,7 +131,7 @@ void Visual::Base::SetOnStage( Actor& actor )
 
 void Visual::Base::SetOffStage( Actor& actor )
 {
 
 void Visual::Base::SetOffStage( Actor& actor )
 {

-  if( GetIsOnStage() )
+  if( IsOnStage() )

   {
     DoSetOffStage( actor );
 
   {
     DoSetOffStage( actor );
 


@@ -134,6 +139,16 @@ void Visual::Base::SetOffStage( Actor& actor )
   }
 }
 
   }
 }
 

+void Visual::Base::CreatePropertyMap( Property::Map& map ) const
+{
+  DoCreatePropertyMap( map );
+
+  if( mImpl->mCustomShader )
+  {
+    mImpl->mCustomShader->CreatePropertyMap( map );
+  }
+}
+

 void Visual::Base::EnablePreMultipliedAlpha( bool preMultipled )
 {
   if(preMultipled)
 void Visual::Base::EnablePreMultipliedAlpha( bool preMultipled )
 {
   if(preMultipled)


@@ -162,22 +177,12 @@ void Visual::Base::DoSetOffStage( Actor& actor )
   mImpl->mRenderer.Reset();
 }
 
   mImpl->mRenderer.Reset();
 }
 

-void Visual::Base::CreatePropertyMap( Property::Map& map ) const
-{
-  DoCreatePropertyMap( map );
-
-  if( mImpl->mCustomShader )
-  {
-    mImpl->mCustomShader->CreatePropertyMap( map );
-  }
-}
-
-bool Visual::Base::GetIsOnStage() const
+bool Visual::Base::IsOnStage() const

 {
   return mImpl->mFlags & Impl::IS_ON_STAGE;
 }
 
 {
   return mImpl->mFlags & Impl::IS_ON_STAGE;
 }
 

-bool Visual::Base::GetIsFromCache() const
+bool Visual::Base::IsFromCache() const

 {
   return mImpl->mFlags & Impl::IS_FROM_CACHE;
 }
 {
   return mImpl->mFlags & Impl::IS_FROM_CACHE;
 }