projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix the wrong focus indicator position after dismissing popup" into devel...
[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
f8d3e5f
..
19c2c74
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,6
+26,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
// INTERNAL INCLUDES
#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>
namespace Dali
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
namespace Dali
@@
-83,9
+84,13
@@
Dali::Vector2 PointToVector2( Toolkit::Align::Type point, Toolkit::Direction::Ty
Internal::Visual::Base::Impl::Impl()
: mCustomShader( NULL ),
Internal::Visual::Base::Impl::Impl()
: mCustomShader( NULL ),
+ mBlendSlotDelegate( NULL ),
mTransform(),
mTransform(),
+ mMixColor( Color::WHITE ),
mControlSize( Vector2::ZERO ),
mDepthIndex( 0.0f ),
mControlSize( Vector2::ZERO ),
mDepthIndex( 0.0f ),
+ mMixColorIndex( Property::INVALID_INDEX ),
+ mOpacityIndex( Property::INVALID_INDEX ),
mFlags( 0 )
{
}
mFlags( 0 )
{
}
@@
-93,6
+98,7
@@
Internal::Visual::Base::Impl::Impl()
Internal::Visual::Base::Impl::~Impl()
{
delete mCustomShader;
Internal::Visual::Base::Impl::~Impl()
{
delete mCustomShader;
+ delete mBlendSlotDelegate;
}
Internal::Visual::Base::Impl::CustomShader::CustomShader( const Property::Map& map )
}
Internal::Visual::Base::Impl::CustomShader::CustomShader( const Property::Map& map )
@@
-112,7
+118,7
@@
void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property:
Property::Value* vertexShaderValue = shaderMap.Find( Toolkit::Visual::Shader::Property::VERTEX_SHADER, CUSTOM_VERTEX_SHADER );
if( vertexShaderValue )
{
Property::Value* vertexShaderValue = shaderMap.Find( Toolkit::Visual::Shader::Property::VERTEX_SHADER, CUSTOM_VERTEX_SHADER );
if( vertexShaderValue )
{
- if( !
vertexShaderValue->Get(
mVertexShader ) )
+ if( !
GetStringFromProperty( *vertexShaderValue,
mVertexShader ) )
{
DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string\n", CUSTOM_VERTEX_SHADER );
}
{
DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string\n", CUSTOM_VERTEX_SHADER );
}
@@
-121,7
+127,7
@@
void Internal::Visual::Base::Impl::CustomShader::SetPropertyMap( const Property:
Property::Value* fragmentShaderValue = shaderMap.Find( Toolkit::Visual::Shader::Property::FRAGMENT_SHADER, CUSTOM_FRAGMENT_SHADER );
if( fragmentShaderValue )
{
Property::Value* fragmentShaderValue = shaderMap.Find( Toolkit::Visual::Shader::Property::FRAGMENT_SHADER, CUSTOM_FRAGMENT_SHADER );
if( fragmentShaderValue )
{
- if( !
fragmentShaderValue->Get(
mFragmentShader ) )
+ if( !
GetStringFromProperty( *fragmentShaderValue,
mFragmentShader ) )
{
DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string\n", CUSTOM_FRAGMENT_SHADER );
}
{
DALI_LOG_ERROR( "'%s' parameter does not correctly specify a string\n", CUSTOM_FRAGMENT_SHADER );
}
@@
-215,6
+221,11
@@
void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
mOrigin = Toolkit::Align::CENTER;
mAnchorPoint = Toolkit::Align::CENTER;
mOrigin = Toolkit::Align::CENTER;
mAnchorPoint = Toolkit::Align::CENTER;
+ UpdatePropertyMap( map );
+}
+
+void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap( const Property::Map& map )
+{
for( Property::Map::SizeType i(0); i<map.Count(); ++i )
{
KeyValuePair keyValue = map.GetKeyValue( i );
for( Property::Map::SizeType i(0); i<map.Count(); ++i )
{
KeyValuePair keyValue = map.GetKeyValue( i );