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
Changed all property & signal names to lowerCamelCase
[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
f2b8a5f
..
cd36331
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
@@
-23,8
+23,8
@@
#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>
-#include <dali/
public
-api/object/type-registry-helper.h>
-#include <dali/
public
-api/scripting/scripting.h>
+#include <dali/
devel
-api/object/type-registry-helper.h>
+#include <dali/
devel
-api/scripting/scripting.h>
#include <dali/integration-api/debug.h>
namespace //Unnamed namespace
#include <dali/integration-api/debug.h>
namespace //Unnamed namespace
@@
-97,14
+97,14
@@
BaseHandle Create()
// Setup properties, signals and actions using the type-registry.
DALI_TYPE_REGISTRATION_BEGIN( Toolkit::SuperBlurView, Toolkit::Control, Create )
// Setup properties, signals and actions using the type-registry.
DALI_TYPE_REGISTRATION_BEGIN( Toolkit::SuperBlurView, Toolkit::Control, Create )
-DALI_PROPERTY_REGISTRATION( SuperBlurView, "image", MAP, IMAGE )
+DALI_PROPERTY_REGISTRATION(
Toolkit,
SuperBlurView, "image", MAP, IMAGE )
DALI_TYPE_REGISTRATION_END()
} // unnamed namespace
SuperBlurView::SuperBlurView( unsigned int blurLevels )
DALI_TYPE_REGISTRATION_END()
} // unnamed namespace
SuperBlurView::SuperBlurView( unsigned int blurLevels )
-: Control( C
ONTROL_BEHAVIOUR_NONE
),
+: Control( C
ontrolBehaviour( DISABLE_SIZE_NEGOTIATION )
),
mBlurLevels( blurLevels ),
mBlurStrengthPropertyIndex(Property::INVALID_INDEX),
mResourcesCleared( true ),
mBlurLevels( blurLevels ),
mBlurStrengthPropertyIndex(Property::INVALID_INDEX),
mResourcesCleared( true ),
@@
-137,7
+137,7
@@
Toolkit::SuperBlurView SuperBlurView::New( unsigned int blurLevels )
void SuperBlurView::OnInitialize()
{
void SuperBlurView::OnInitialize()
{
- mBlurStrengthPropertyIndex = Self().RegisterProperty( "blur
-strength",
0.f );
+ mBlurStrengthPropertyIndex = Self().RegisterProperty( "blur
Strength",
0.f );
DALI_ASSERT_ALWAYS( mImageActors.size() == mBlurLevels+1 && "must synchronize the ImageActor group if blur levels got changed " );
for(unsigned int i=0; i<=mBlurLevels;i++)
DALI_ASSERT_ALWAYS( mImageActors.size() == mBlurLevels+1 && "must synchronize the ImageActor group if blur levels got changed " );
for(unsigned int i=0; i<=mBlurLevels;i++)
@@
-252,7
+252,7
@@
void SuperBlurView::ClearBlurResource()
}
}
}
}
-void SuperBlurView::On
Control
SizeSet( const Vector3& targetSize )
+void SuperBlurView::OnSizeSet( const Vector3& targetSize )
{
if( mTargetSize != Vector2(targetSize) )
{
{
if( mTargetSize != Vector2(targetSize) )
{