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 for cursor. Avoid the jump of the grab handle when there is a mix of...
[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
..
444a3fd
100644
(file)
--- 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 "cube-transition-effect-impl.h"
// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
#include <dali/public-api/common/stage.h>
#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/devel-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
+38,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( 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 );
(-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,7
+117,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.Set
Size(Stage::GetCurrent().GetSize()
);
+ mEmptyImage.Set
ResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS
);
mEmptyImage.SetParentOrigin( ParentOrigin::CENTER );
mEmptyImage.SetAnchorPoint( AnchorPoint::CENTER );
mFullImageCreator = FullAreaImageCreator::New();
mEmptyImage.SetParentOrigin( ParentOrigin::CENTER );
mEmptyImage.SetAnchorPoint( AnchorPoint::CENTER );
mFullImageCreator = FullAreaImageCreator::New();