X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-effect-impl.cpp;h=444a3fd1834f1517d35c6fe7d87af9fd6771060e;hp=1d3505039c788cf5a42ced67fedca4868384fb7a;hb=005f449f3648e36e0cc997735b58b0ebb7a6390b;hpb=1b1e10a3f4e486553200d8ddeb57d953c2284579 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..444a3fd 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp @@ -19,9 +19,11 @@ #include "cube-transition-effect-impl.h" // EXTERNAL INCLUDES +#include // for strcmp #include -#include +#include #include +#include #include namespace Dali @@ -36,13 +38,12 @@ namespace Internal 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( Toolkit, 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 +91,7 @@ void CubeTransitionEffect::Initialize() (-mViewAreaSize.height + mTileSize.height) * 0.5f, -mTileSize.width * 0.5f ); - Image placeHolder = BitmapImage::WHITE(); + Image placeHolder = BufferImage::WHITE(); for( unsigned int y = 0; y < mNumRows; y++ ) { float positionY = y * mTileSize.height + basePosition.y; @@ -116,7 +117,7 @@ void CubeTransitionEffect::Initialize() // helper actor to create a off-screen image using shader effect mEmptyImage = ImageActor::New( placeHolder ); - mEmptyImage.SetSize(Stage::GetCurrent().GetSize()); + mEmptyImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mEmptyImage.SetParentOrigin( ParentOrigin::CENTER ); mEmptyImage.SetAnchorPoint( AnchorPoint::CENTER ); mFullImageCreator = FullAreaImageCreator::New();