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 "Ensuring test files match dali-core/adaptor" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
transition-effects
/
cube-transition-wave-effect.h
diff --git
a/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h
b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h
index
a3b1dc1
..
5043ae5
100644
(file)
--- a/
dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h
+++ b/
dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H__
-#define
__DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H__
+#ifndef
DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H
+#define
DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,49
+22,49
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal DALI_INTERNAL
{
namespace Internal DALI_INTERNAL
{
-
/**
+/**
* CubeTransitionWaveEffect implementation class
*/
* CubeTransitionWaveEffect implementation class
*/
-
class CubeTransitionWaveEffect;
+class CubeTransitionWaveEffect;
-} // namespace
Internal
+} // namespace
DALI_INTERNAL
/**
* SubClass of CubeTransitionEffect
* Rotate the cubes successively according to the finger movement to achieve wave-like transition effect
*/
/**
* SubClass of CubeTransitionEffect
* Rotate the cubes successively according to the finger movement to achieve wave-like transition effect
*/
-class DALI_
IMPOR
T_API CubeTransitionWaveEffect : public CubeTransitionEffect
+class DALI_
TOOLKI
T_API CubeTransitionWaveEffect : public CubeTransitionEffect
{
{
-
public:
public:
-
/**
* Create an initialized CubeTransitionWaveEffect
* @param[in] numRows How many rows of cubes
* @param[in] numColumns How many columns of cubes
/**
* Create an initialized CubeTransitionWaveEffect
* @param[in] numRows How many rows of cubes
* @param[in] numColumns How many columns of cubes
- * @param[in] viewAreaSize The size of view area for this transition effect
* @return The initialized CubeTransitionWaveEffect object
*/
* @return The initialized CubeTransitionWaveEffect object
*/
- static CubeTransitionWaveEffect New( unsigned int numRows, unsigned int numColumns, Size viewAreaSize );
-
+ static CubeTransitionWaveEffect New(unsigned int numRows, unsigned int numColumns);
public: // Not intended for developer use
public: // Not intended for developer use
+ /**
+ * Creates a handle using the Toolkit::Internal implementation.
+ * @param[in] implementation The Control implementation.
+ */
+ DALI_INTERNAL CubeTransitionWaveEffect(Internal::CubeTransitionWaveEffect& implementation);
/**
/**
- *
This constructor is used by Dali New() methods
.
- * @param[in]
impl A pointer to a newly allocated Dali resource
+ *
Allows the creation of this Control from an Internal::CustomActor pointer
.
+ * @param[in]
internal A pointer to the internal CustomActor.
*/
*/
-
explicit DALI_INTERNAL CubeTransitionWaveEffect( Internal::CubeTransitionWaveEffect* impl
);
+
DALI_INTERNAL CubeTransitionWaveEffect(Dali::Internal::CustomActor* internal
);
}; // class CubeTransitionWaveEffect
} // namespace Toolkit
} // namespace Dali
}; // class CubeTransitionWaveEffect
} // namespace Toolkit
} // namespace Dali
-#endif /* __DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H__ */
+
+#endif // DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H