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
Updates for const->constexpr
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-portrait-view-impl.cpp
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
(file)
--- 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&
p
ageSize )
-: PageTurnView( pageFactory,
p
ageSize )
+PageTurnPortraitView::PageTurnPortraitView( PageFactory& pageFactory, const Vector2&
viewP
ageSize )
+: PageTurnView( pageFactory,
viewP
ageSize )
{
}
{
}
@@
-57,10
+57,10
@@
PageTurnPortraitView::~PageTurnPortraitView()
{
}
{
}
-Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2&
p
ageSize )
+Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2&
viewP
ageSize )
{
// Create the implementation, temporarily owned on stack
{
// Create the implementation, temporarily owned on stack
- IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory,
p
ageSize );
+ IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory,
viewP
ageSize );
// Pass ownership to CustomActor
Dali::Toolkit::PageTurnPortraitView pageTurnView( *internalPageTurnView );
// 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;
mSpineEffectShader.RegisterProperty(PROPERTY_TEXTURE_WIDTH, 1.f );
mControlSize = mPageSize;
- Self().Set
Size(
mPageSize );
- mTurningPageLayer.SetP
arentOrigin(
ParentOrigin::CENTER_LEFT );
+ Self().Set
Property( Actor::Property::SIZE,
mPageSize );
+ mTurningPageLayer.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER_LEFT );
}
Vector2 PageTurnPortraitView::SetPanPosition( const Vector2& gesturePosition )
}
Vector2 PageTurnPortraitView::SetPanPosition( const Vector2& gesturePosition )
@@
-125,7
+125,7
@@
void PageTurnPortraitView::OnPossibleOutwardsFlick( const Vector2& panPosition,
OrganizePageDepth();
mPageUpdated = true;
OrganizePageDepth();
mPageUpdated = true;
- actor.Set
Visible(
true);
+ actor.Set
Property( Actor::Property::VISIBLE,
true);
// Add the page to tuning page layer and set up PageTurnEffect
mShadowView.Add( actor );
// 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 )
{
{
if( isLeftSide )
{
- actor.Set
Visible(
false );
+ actor.Set
Property( Actor::Property::VISIBLE,
false );
}
}
}
}