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
Size negotiation patch 1: Removed SetPreferred size
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
transition-effects
/
cube-transition-effect-impl.cpp
diff --git
a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index
1d35050
..
1a58f8d
100644
(file)
--- a/
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@
-20,8
+20,9
@@
// EXTERNAL INCLUDES
#include <dali/public-api/common/stage.h>
// EXTERNAL INCLUDES
#include <dali/public-api/common/stage.h>
-#include <dali/public-api/images/
image-attributes
.h>
+#include <dali/public-api/images/
buffer-image
.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/render-tasks/render-task-list.h>
namespace Dali
#include <dali/public-api/render-tasks/render-task-list.h>
namespace Dali
@@
-36,13
+37,12
@@
namespace Internal
namespace
{
namespace
{
-// Signals
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN( Toolkit::CubeTransitionEffect, Dali::BaseHandle, NULL );
-const char* const SIGNAL_TRANSITION_COMPLETED = "transition-completed";
+DALI_SIGNAL_REGISTRATION( CubeTransitionEffect, "transition-completed", SIGNAL_TRANSITION_COMPLETED )
-TypeRegistration typeRegistration( typeid( Toolkit::CubeTransitionEffect ), typeid( Dali::BaseHandle ), NULL );
-
-SignalConnectorType signalConnector1( typeRegistration, SIGNAL_TRANSITION_COMPLETED , &CubeTransitionEffect::DoConnectSignal );
+DALI_TYPE_REGISTRATION_END()
}
}
@@
-90,7
+90,7
@@
void CubeTransitionEffect::Initialize()
(-mViewAreaSize.height + mTileSize.height) * 0.5f,
-mTileSize.width * 0.5f );
(-mViewAreaSize.height + mTileSize.height) * 0.5f,
-mTileSize.width * 0.5f );
- Image placeHolder = B
itmap
Image::WHITE();
+ Image placeHolder = B
uffer
Image::WHITE();
for( unsigned int y = 0; y < mNumRows; y++ )
{
float positionY = y * mTileSize.height + basePosition.y;
for( unsigned int y = 0; y < mNumRows; y++ )
{
float positionY = y * mTileSize.height + basePosition.y;
@@
-116,6
+116,7
@@
void CubeTransitionEffect::Initialize()
// helper actor to create a off-screen image using shader effect
mEmptyImage = ImageActor::New( placeHolder );
// helper actor to create a off-screen image using shader effect
mEmptyImage = ImageActor::New( placeHolder );
+ mEmptyImage.SetRelayoutEnabled( false );
mEmptyImage.SetSize(Stage::GetCurrent().GetSize());
mEmptyImage.SetParentOrigin( ParentOrigin::CENTER );
mEmptyImage.SetAnchorPoint( AnchorPoint::CENTER );
mEmptyImage.SetSize(Stage::GetCurrent().GetSize());
mEmptyImage.SetParentOrigin( ParentOrigin::CENTER );
mEmptyImage.SetAnchorPoint( AnchorPoint::CENTER );
@@
-139,6
+140,7
@@
void CubeTransitionEffect::Initialize()
ImageActor CubeTransitionEffect::CreateTile( Image image, const Vector4& color )
{
ImageActor tile = ImageActor::New( image );
ImageActor CubeTransitionEffect::CreateTile( Image image, const Vector4& color )
{
ImageActor tile = ImageActor::New( image );
+ tile.SetRelayoutEnabled( false );
tile.SetParentOrigin( ParentOrigin::CENTER );
tile.SetAnchorPoint( AnchorPoint::CENTER );
tile.SetSize( mTileSize );
tile.SetParentOrigin( ParentOrigin::CENTER );
tile.SetAnchorPoint( AnchorPoint::CENTER );
tile.SetSize( mTileSize );