Merge changes I7066e6c1,I3f0c228e into devel/master

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

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index 1826196..2f8cae6 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@ -25,7 +25,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
 
 namespace Dali
@@ -82,8 +82,9 @@ Dali::Vector2 PointToVector2( Toolkit::Align::Type point, Toolkit::Direction::Ty
 } // unnamed namespace
 
 Internal::Visual::Base::Impl::Impl()
-: mCustomShader(NULL),
+: mCustomShader( NULL ),
   mTransform(),
+  mControlSize( Vector2::ZERO ),
   mDepthIndex( 0.0f ),
   mFlags( 0 )
 {
@@ -192,7 +193,7 @@ void Internal::Visual::Base::Impl::CustomShader::CreatePropertyMap( Property::Ma
       customShader.Insert( Toolkit::Visual::Shader::Property::HINTS, static_cast< int >( mHints ) );
     }
 
-    map.Insert( Toolkit::VisualProperty::SHADER, customShader );
+    map.Insert( Toolkit::DevelVisual::Property::SHADER, customShader );
   }
 }
 
@@ -217,15 +218,15 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
   for( Property::Map::SizeType i(0); i<map.Count(); ++i )
   {
     KeyValuePair keyValue = map.GetKeyValue( i );
-    if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::OFFSET )
+    if( keyValue.first == Toolkit::DevelVisual::Transform::Property::OFFSET )
     {
       keyValue.second.Get( mOffset );
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::SIZE )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::SIZE )
     {
       keyValue.second.Get( mSize );
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::ORIGIN )
     {
       Toolkit::Align::Type align(Toolkit::Align::CENTER);
       if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
@@ -233,7 +234,7 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
         mOrigin = align;
       }
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT )
     {
       Toolkit::Align::Type align(Toolkit::Align::CENTER);
       if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
@@ -241,7 +242,7 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
         mAnchorPoint = align;
       }
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE )
     {
       keyValue.second.Get( mOffsetSizeMode );
     }
@@ -251,11 +252,11 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
 void Internal::Visual::Base::Impl::Transform::GetPropertyMap( Property::Map& map ) const
 {
   map.Clear();
-  map.Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, mOffset )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, mSize )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, mOrigin )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, mAnchorPoint )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, mOffsetSizeMode );
+  map.Add( Toolkit::DevelVisual::Transform::Property::OFFSET, mOffset )
+     .Add( Toolkit::DevelVisual::Transform::Property::SIZE, mSize )
+     .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, mOrigin )
+     .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, mAnchorPoint )
+     .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, mOffsetSizeMode );
 }
 
 void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer renderer, Toolkit::Direction::Type direction )
@@ -267,6 +268,13 @@ void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer r
   renderer.RegisterProperty( ANCHOR_POINT, Vector2(0.5,0.5) - PointToVector2( mAnchorPoint, direction ) );
 }
 
+Vector2 Internal::Visual::Base::Impl::Transform::GetVisualSize( const Vector2& controlSize )
+{
+  return Vector2( Lerp( mOffsetSizeMode.x, mSize.x * controlSize.x, mSize.x ),
+                  Lerp( mOffsetSizeMode.y, mSize.y * controlSize.y, mSize.y ) );
+}
+
+
 } // namespace Internal
 
 } // namespace Toolkit