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
Merge "NPatch rendering optimization" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index
2964578
..
e258b69
100644
(file)
--- a/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@
-413,7
+413,7
@@
void PageTurnView::OnInitialize()
mPages[0].actor.SetProperty( Actor::Property::VISIBLE,true);
// enable the pan gesture which is attached to the control
mPages[0].actor.SetProperty( Actor::Property::VISIBLE,true);
// enable the pan gesture which is attached to the control
- EnableGestureDetection(Gesture
::Type(Gesture::Pan
));
+ EnableGestureDetection(Gesture
Type::Value(GestureType::PAN
));
}
Shader PageTurnView::CreateShader( const Property::Map& shaderMap )
}
Shader PageTurnView::CreateShader( const Property::Map& shaderMap )
@@
-614,7
+614,7
@@
void PageTurnView::OnPan( const PanGesture& gesture )
// the pan gesture is attached to control itself instead of each page
switch( gesture.GetState() )
{
// the pan gesture is attached to control itself instead of each page
switch( gesture.GetState() )
{
- case Gesture
::Started
:
+ case Gesture
State::STARTED
:
{
// check whether the undergoing turning page number already reaches the maximum allowed
if( mPageUpdated && mAnimatingCount< MAXIMUM_TURNING_NUM && mSlidingCount < 1 )
{
// check whether the undergoing turning page number already reaches the maximum allowed
if( mPageUpdated && mAnimatingCount< MAXIMUM_TURNING_NUM && mSlidingCount < 1 )
@@
-633,19
+633,19
@@
void PageTurnView::OnPan( const PanGesture& gesture )
}
break;
}
}
break;
}
- case Gesture
::Continuing
:
+ case Gesture
State::CONTINUING
:
{
PanContinuing( SetPanPosition( gesture.GetPosition() ) ); // pass in the pan position in the local page coordinate
break;
}
{
PanContinuing( SetPanPosition( gesture.GetPosition() ) ); // pass in the pan position in the local page coordinate
break;
}
- case Gesture
::Finished
:
- case Gesture
::Cancelled
:
+ case Gesture
State::FINISHED
:
+ case Gesture
State::CANCELLED
:
{
PanFinished( SetPanPosition( gesture.GetPosition() ), gesture.GetSpeed() );
break;
}
{
PanFinished( SetPanPosition( gesture.GetPosition() ), gesture.GetSpeed() );
break;
}
- case Gesture
::Clear
:
- case Gesture
::Possible
:
+ case Gesture
State::CLEAR
:
+ case Gesture
State::POSSIBLE
:
default:
{
break;
default:
{
break;