X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-landscape-view-impl.cpp;h=fbbc650ec3de5a756723e56880253a953962b57d;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hp=593eac56db3356714ec26cd3d01b4aa278cef4fb;hpb=3355135c32ee6deee76790d2685fe5308ba96db4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp index 593eac5..fbbc650 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -39,18 +39,18 @@ DALI_TYPE_REGISTRATION_END() } -PageTurnLandscapeView::PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& pageSize ) -: PageTurnView( pageFactory, pageSize ) +PageTurnLandscapeView::PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& viewPageSize ) +: PageTurnView( pageFactory, viewPageSize ) { } PageTurnLandscapeView::~PageTurnLandscapeView() {} -Toolkit::PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& pageSize ) +Toolkit::PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& viewPageSize ) { // Create the implementation, temporarily owned on stack - IntrusivePtr< PageTurnLandscapeView > internalPageTurnView = new PageTurnLandscapeView( pageFactory, pageSize ); + IntrusivePtr< PageTurnLandscapeView > internalPageTurnView = new PageTurnLandscapeView( pageFactory, viewPageSize ); // Pass ownership to CustomActor Dali::Toolkit::PageTurnLandscapeView pageTurnView( *internalPageTurnView ); @@ -68,13 +68,13 @@ void PageTurnLandscapeView::OnPageTurnViewInitialize() mSpineEffectShader.RegisterProperty(PROPERTY_TEXTURE_WIDTH, 2.f ); mControlSize = Vector2( mPageSize.width * 2.f, mPageSize.height ); - Self().SetSize( mControlSize ); - mTurningPageLayer.SetParentOrigin( ParentOrigin::CENTER ); + Self().SetProperty( Actor::Property::SIZE, mControlSize ); + mTurningPageLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); } void PageTurnLandscapeView::OnAddPage( Actor newPage, bool isLeftSide ) { - newPage.SetParentOrigin( ParentOrigin::CENTER ); + newPage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); } Vector2 PageTurnLandscapeView::SetPanPosition( const Vector2& gesturePosition )