X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Ftransition-effects%2Fcube-transition-cross-effect.h;h=adbab92c096f8a9456105c2705c12c9ea8953ecf;hp=9d318e95fad35a8e945056d6d8414f5dbf424f0e;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=c3f7ea6cb0c0b75c2276193aff88b5c7a679a2d5;ds=sidebyside diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h index 9d318e9..adbab92 100644 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H__ -#define __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H__ +#ifndef DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H +#define DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -37,9 +37,9 @@ namespace Internal DALI_INTERNAL /** * SubClass of CubeTransitionEffect - * Rotate the neighboring cubes in perpendicular directions to transite from one image to another + * Rotate the neighboring cubes in perpendicular directions to transition from one image to another */ -class DALI_IMPORT_API CubeTransitionCrossEffect : public CubeTransitionEffect +class DALI_TOOLKIT_API CubeTransitionCrossEffect : public CubeTransitionEffect { public: @@ -48,19 +48,24 @@ public: * Create an initialized CubeTransitionCrossEffect * @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 CubeTransitionCrossEffect object */ - static CubeTransitionCrossEffect New( unsigned int numRows, unsigned int numColumns, Size viewAreaSize ); + static CubeTransitionCrossEffect New( unsigned int numRows, unsigned int numColumns ); public: // Not intended for developer use /** - * This constructor is used by Dali New() methods. - * @param [in] impl A pointer to a newly allocated Dali resource + * Creates a handle using the Toolkit::Internal implementation. + * @param[in] implementation The Control implementation. */ - explicit DALI_INTERNAL CubeTransitionCrossEffect( Internal::CubeTransitionCrossEffect* impl ); + DALI_INTERNAL CubeTransitionCrossEffect( Internal::CubeTransitionCrossEffect& implementation ); + + /** + * Allows the creation of this Control from an Internal::CustomActor pointer. + * @param[in] internal A pointer to the internal CustomActor. + */ + DALI_INTERNAL CubeTransitionCrossEffect( Dali::Internal::CustomActor* internal ); }; // class CubeTransitionCrossEffect @@ -68,4 +73,4 @@ public: // Not intended for developer use } // namespace Dali -#endif /* __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H__ */ +#endif // DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H