/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/helpers/property-helper.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Align, BOTTOM_END )
DALI_ENUM_TO_STRING_TABLE_END( ALIGN )
+DALI_ENUM_TO_STRING_TABLE_BEGIN( POLICY )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual::Transform::Policy, RELATIVE )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual::Transform::Policy, ABSOLUTE )
+DALI_ENUM_TO_STRING_TABLE_END( POLICY )
+
Dali::Vector2 PointToVector2( Toolkit::Align::Type point, Toolkit::Direction::Type direction )
{
static const float pointToVector2[] = { 0.0f,0.0f,
return result;
}
+bool GetPolicyFromValue( const Property::Value& value, Vector2& policy )
+{
+ bool success = false;
+ if( value.Get( policy ) )
+ {
+ success = true;
+ }
+ else
+ {
+ Property::Array* array = value.GetArray();
+ if( array && array->Size() == 2 )
+ {
+ Toolkit::Visual::Transform::Policy::Type xPolicy = static_cast< Toolkit::Visual::Transform::Policy::Type >( -1 ); // Assign an invalid value so definitely changes
+ Toolkit::Visual::Transform::Policy::Type yPolicy = static_cast< Toolkit::Visual::Transform::Policy::Type >( -1 ); // Assign an invalid value so definitely changes
+
+ if( Scripting::GetEnumerationProperty< Toolkit::Visual::Transform::Policy::Type >( array->GetElementAt( 0 ), POLICY_TABLE, POLICY_TABLE_COUNT, xPolicy ) &&
+ Scripting::GetEnumerationProperty< Toolkit::Visual::Transform::Policy::Type >( array->GetElementAt( 1 ), POLICY_TABLE, POLICY_TABLE_COUNT, yPolicy ) )
+ {
+ policy.x = xPolicy;
+ policy.y = yPolicy;
+ success = true;
+ }
+ }
+ }
+ return success;
+}
+
} // unnamed namespace
-Internal::Visual::Base::Impl::Impl()
+Internal::Visual::Base::Impl::Impl(FittingMode fittingMode)
: mCustomShader( NULL ),
mBlendSlotDelegate( NULL ),
+ mEventObserver( NULL ),
mTransform(),
mMixColor( Color::WHITE ),
mControlSize( Vector2::ZERO ),
+ mCornerRadius( 0.0f ),
mDepthIndex( 0.0f ),
mMixColorIndex( Property::INVALID_INDEX ),
- mOpacityIndex( Property::INVALID_INDEX ),
- mFlags( 0 )
+ mCornerRadiusIndex( Property::INVALID_INDEX ),
+ mFittingMode( fittingMode ),
+ mFlags( 0 ),
+ mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING )
{
}
customShader.Insert( Toolkit::Visual::Shader::Property::HINTS, static_cast< int >( mHints ) );
}
- map.Insert( Toolkit::DevelVisual::Property::SHADER, customShader );
+ map.Insert( Toolkit::Visual::Property::SHADER, customShader );
}
}
Internal::Visual::Base::Impl::Transform::Transform()
: mOffset( 0.0f,0.0f ),
mSize( 1.0f,1.0f ),
+ mExtraSize( 0.0f,0.0f ),
mOffsetSizeMode( 0.0f,0.0f,0.0f,0.0f ),
- mOrigin( Toolkit::Align::CENTER ),
- mAnchorPoint( Toolkit::Align::CENTER )
+ mOrigin( Toolkit::Align::TOP_BEGIN ),
+ mAnchorPoint( Toolkit::Align::TOP_BEGIN )
{
}
// Set default values
mOffset = Vector2( 0.0f,0.0f );
mSize = Vector2( 1.0f,1.0f );
+ mExtraSize = Vector2( 0.0f,0.0f );
mOffsetSizeMode = Vector4( 0.0f,0.0f,0.0f,0.0f );
- mOrigin = Toolkit::Align::CENTER;
- mAnchorPoint = Toolkit::Align::CENTER;
+ mOrigin = Toolkit::Align::TOP_BEGIN;
+ mAnchorPoint = Toolkit::Align::TOP_BEGIN;
UpdatePropertyMap( map );
}
{
switch( keyValue.first.indexKey )
{
- case Toolkit::DevelVisual::Transform::Property::OFFSET:
+ case Toolkit::Visual::Transform::Property::OFFSET:
{
keyValue.second.Get( mOffset );
break;
}
- case Toolkit::DevelVisual::Transform::Property::SIZE:
+ case Toolkit::Visual::Transform::Property::SIZE:
{
keyValue.second.Get( mSize );
break;
}
- case Toolkit::DevelVisual::Transform::Property::ORIGIN:
+ case Toolkit::Visual::Transform::Property::ORIGIN:
{
Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mOrigin );
break;
}
- case Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT:
+ case Toolkit::Visual::Transform::Property::ANCHOR_POINT:
{
Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mAnchorPoint );
break;
}
- case Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE:
+ case Toolkit::Visual::Transform::Property::OFFSET_POLICY:
{
- keyValue.second.Get( mOffsetSizeMode );
+ Vector2 policy;
+ if( GetPolicyFromValue( keyValue.second, policy ) )
+ {
+ mOffsetSizeMode.x = policy.x;
+ mOffsetSizeMode.y = policy.y;
+ }
+ break;
+ }
+ case Toolkit::Visual::Transform::Property::SIZE_POLICY:
+ {
+ Vector2 policy;
+ if( GetPolicyFromValue( keyValue.second, policy ) )
+ {
+ mOffsetSizeMode.z = policy.x;
+ mOffsetSizeMode.w = policy.y;
+ }
+ break;
+ }
+ case Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE:
+ {
+ keyValue.second.Get( mExtraSize );
break;
}
}
}
else if( keyValue.first == "origin" )
{
- Toolkit::Align::Type align(Toolkit::Align::CENTER);
- if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
+ Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mOrigin );
+ }
+ else if( keyValue.first == "anchorPoint" )
+ {
+ Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, mAnchorPoint );
+ }
+ else if( keyValue.first == "offsetPolicy" )
+ {
+ Vector2 policy;
+ if( GetPolicyFromValue( keyValue.second, policy ) )
{
- mOrigin = align;
+ mOffsetSizeMode.x = policy.x;
+ mOffsetSizeMode.y = policy.y;
}
}
- else if( keyValue.first == "anchorPoint" )
+ else if( keyValue.first == "sizePolicy" )
{
- Toolkit::Align::Type align(Toolkit::Align::CENTER);
- if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
+ Vector2 policy;
+ if( GetPolicyFromValue( keyValue.second, policy ) )
{
- mAnchorPoint = align;
+ mOffsetSizeMode.z = policy.x;
+ mOffsetSizeMode.w = policy.y;
}
}
- else if( keyValue.first == "offsetSizeMode" )
+ else if( keyValue.first == "extraSize" )
{
- keyValue.second.Get( mOffsetSizeMode );
+ keyValue.second.Get( mExtraSize );
}
}
}
void Internal::Visual::Base::Impl::Transform::GetPropertyMap( Property::Map& map ) const
{
map.Clear();
- 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 );
+ map.Add( Toolkit::Visual::Transform::Property::OFFSET, mOffset )
+ .Add( Toolkit::Visual::Transform::Property::SIZE, mSize )
+ .Add( Toolkit::Visual::Transform::Property::ORIGIN, mOrigin )
+ .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, mAnchorPoint )
+ .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( mOffsetSizeMode.x, mOffsetSizeMode.y ) )
+ .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( mOffsetSizeMode.z, mOffsetSizeMode.w ) )
+ .Add( Toolkit::DevelVisual::Transform::Property::EXTRA_SIZE, mExtraSize );
}
void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer renderer, Toolkit::Direction::Type direction )
renderer.RegisterProperty( OFFSET_SIZE_MODE, mOffsetSizeMode );
renderer.RegisterProperty( ORIGIN, PointToVector2( mOrigin, direction ) - Vector2(0.5,0.5) );
renderer.RegisterProperty( ANCHOR_POINT, Vector2(0.5,0.5) - PointToVector2( mAnchorPoint, direction ) );
+ renderer.RegisterProperty( EXTRA_SIZE, mExtraSize );
}
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 ) );
+ return Vector2( Lerp( mOffsetSizeMode.z, mSize.x * controlSize.x, mSize.x ) ,
+ Lerp( mOffsetSizeMode.w, mSize.y * controlSize.y, mSize.y ) ) + mExtraSize;
}
-
} // namespace Internal
} // namespace Toolkit
projects / platform / core / uifw / dali-toolkit.git / blobdiff