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 "Added TextLabel and TextField tests" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
super-blur-view
/
super-blur-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index
1b15f2b
..
f2b8a5f
100644
(file)
--- a/
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@
-20,7
+20,6
@@
// EXTERNAL INCLUDES
#include <cmath>
// EXTERNAL INCLUDES
#include <cmath>
-#include <dali/public-api/animation/active-constraint.h>
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/type-registry.h>
@@
-54,20
+53,20
@@
struct ActorOpacityConstraint
mRange = Vector2( index*rangeLength, (index+1.f)*rangeLength );
}
mRange = Vector2( index*rangeLength, (index+1.f)*rangeLength );
}
-
float operator()( float current, const PropertyInput& blurProperty
)
+
void operator()( float& current, const PropertyInputContainer& inputs
)
{
{
- float blurStrength =
blurProperty.
GetFloat();
+ float blurStrength =
inputs[0]->
GetFloat();
if(blurStrength <= mRange.x)
{
if(blurStrength <= mRange.x)
{
-
return
1.f;
+
current =
1.f;
}
else if(blurStrength > mRange.y)
{
}
else if(blurStrength > mRange.y)
{
-
return
0.f;
+
current =
0.f;
}
else
{
}
else
{
-
return (mRange.y - blurStrength)/(mRange.y-mRange.x
);
+
current = ( mRange.y - blurStrength) / ( mRange.y - mRange.x
);
}
}
}
}
@@
-144,6
+143,7
@@
void SuperBlurView::OnInitialize()
for(unsigned int i=0; i<=mBlurLevels;i++)
{
mImageActors[i] = ImageActor::New( );
for(unsigned int i=0; i<=mBlurLevels;i++)
{
mImageActors[i] = ImageActor::New( );
+ mImageActors[i].SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
mImageActors[i].SetParentOrigin( ParentOrigin::CENTER );
mImageActors[i].SetZ(-static_cast<float>(i)*0.01f);
mImageActors[i].SetColorMode( USE_OWN_MULTIPLY_PARENT_ALPHA );
mImageActors[i].SetParentOrigin( ParentOrigin::CENTER );
mImageActors[i].SetZ(-static_cast<float>(i)*0.01f);
mImageActors[i].SetColorMode( USE_OWN_MULTIPLY_PARENT_ALPHA );
@@
-152,7
+152,9
@@
void SuperBlurView::OnInitialize()
for(unsigned int i=0; i < mBlurLevels; i++)
{
for(unsigned int i=0; i < mBlurLevels; i++)
{
- mImageActors[i].ApplyConstraint( Constraint::New<float>( Actor::Property::COLOR_ALPHA, ParentSource( mBlurStrengthPropertyIndex ), ActorOpacityConstraint(mBlurLevels, i) ) );
+ Constraint constraint = Constraint::New<float>( mImageActors[i], Actor::Property::COLOR_ALPHA, ActorOpacityConstraint(mBlurLevels, i) );
+ constraint.AddSource( ParentSource( mBlurStrengthPropertyIndex ) );
+ constraint.Apply();
}
Self().SetSize(Stage::GetCurrent().GetSize());
}
Self().SetSize(Stage::GetCurrent().GetSize());
@@
-250,16
+252,6
@@
void SuperBlurView::ClearBlurResource()
}
}
}
}
-void SuperBlurView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
-{
- unsigned int numChildren = Self().GetChildCount();
-
- for( unsigned int i=0; i<numChildren; ++i )
- {
- Self().GetChildAt(i).SetSize(size);
- }
-}
-
void SuperBlurView::OnControlSizeSet( const Vector3& targetSize )
{
if( mTargetSize != Vector2(targetSize) )
void SuperBlurView::OnControlSizeSet( const Vector3& targetSize )
{
if( mTargetSize != Vector2(targetSize) )