X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-portrait-view-impl.cpp;h=d4566bff846501853ad4ef2d5413b0c95dd35ad7;hp=25393e91abb82d3138f66aa9af7d9d889347e9d5;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=3d485e1b28628f0c6e1c5489c2dc31a65ac7ec52 diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp index 25393e9..d4566bf 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp @@ -48,8 +48,8 @@ const float PAGE_TURN_OVER_ANIMATION_DURATION(0.5f); } -PageTurnPortraitView::PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize ) -: PageTurnView( pageFactory, pageSize ) +PageTurnPortraitView::PageTurnPortraitView( PageFactory& pageFactory, const Vector2& viewPageSize ) +: PageTurnView( pageFactory, viewPageSize ) { } @@ -57,10 +57,10 @@ PageTurnPortraitView::~PageTurnPortraitView() { } -Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& pageSize ) +Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& viewPageSize ) { // Create the implementation, temporarily owned on stack - IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory, pageSize ); + IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory, viewPageSize ); // Pass ownership to CustomActor Dali::Toolkit::PageTurnPortraitView pageTurnView( *internalPageTurnView ); @@ -78,8 +78,8 @@ void PageTurnPortraitView::OnPageTurnViewInitialize() mSpineEffectShader.RegisterProperty(PROPERTY_TEXTURE_WIDTH, 1.f ); mControlSize = mPageSize; - Self().SetSize( mPageSize ); - mTurningPageLayer.SetParentOrigin( ParentOrigin::CENTER_LEFT ); + Self().SetProperty( Actor::Property::SIZE, mPageSize ); + mTurningPageLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); } Vector2 PageTurnPortraitView::SetPanPosition( const Vector2& gesturePosition ) @@ -125,7 +125,7 @@ void PageTurnPortraitView::OnPossibleOutwardsFlick( const Vector2& panPosition, OrganizePageDepth(); mPageUpdated = true; - actor.SetVisible(true); + actor.SetProperty( Actor::Property::VISIBLE,true); // Add the page to tuning page layer and set up PageTurnEffect mShadowView.Add( actor ); @@ -154,7 +154,7 @@ void PageTurnPortraitView::OnTurnedOver( Actor actor, bool isLeftSide ) { if( isLeftSide ) { - actor.SetVisible( false ); + actor.SetProperty( Actor::Property::VISIBLE, false ); } }