X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-view-impl.h;h=d438a649e0f891d808659b8f08d57264c0829920;hb=e58197b2ce320f167a24865cdd048f0cc0c05e45;hp=f549dca4c29c8064cb2534fda77b9d9d5da974d4;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h index f549dca..d438a64 100644 --- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h +++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h @@ -18,8 +18,11 @@ * */ -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include +#include + +// INTERNAL INCLUDES #include #include #include @@ -134,7 +137,7 @@ protected: * @param[in] actor The actor which the shader effect would be applied onto * @param[in] shaderEffect The shader effect to be set to the actor */ - void SetShaderEffect( Actor actor, ShaderEffect shaderEffect ); + void SetShaderEffect( ImageActor actor, ShaderEffect shaderEffect ); private: @@ -253,7 +256,7 @@ private: // implemented differently by PageTurnLandscapeView and PageTurnPortrai * @param[in] actor The current page actor * @param[in] isLeftSide Which side the current page is located */ - virtual void SetSpineEffect(Actor actor, bool isLeftSide) = 0; + virtual void SetSpineEffect(ImageActor actor, bool isLeftSide) = 0; /** * This method is called when pan finished to detect outwards flick @@ -327,8 +330,8 @@ protected: std::vector mPageActors; ///< The vector of pages on stage int mCurrentPageIndex; ///< The index of the current page, between 0 ~ mTotalPageCount-1 - std::map mIsTurnBack; ///< The map to keep track the page actor's turning direction - std::map mAnimationActorPair; ///< The map to keep track which page actor is the animation act on + std::map mIsTurnBack; ///< The map to keep track the page actor's turning direction + std::map mAnimationActorPair; ///< The map to keep track which page actor is the animation act on std::map mAnimationIndexPair; ///< The map to keep track which PageTurnEffect, PanDisplacementProperty, CurrentCenterProperty is used for the animation int mIndex; ///< The index to keep track which PageTurnEffect, PanDisplacementProperty, CurrentCenterProperty is used for the current panning page std::vector mIsAnimating; ///< The boolean vector to keep track which PageTurnEffect, PanDisplacementProperty, CurrentCenterProperty is available for using