X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-view-impl.cpp;h=e258b694b21816f0b71ad9216f650f38ef2cc6a8;hb=81b6946e6eae9989ba04ba164adf9347e85efdfe;hp=296457850d8edafb5e48c9a0622c6adcaae4a673;hpb=14455946a98df9b2f7cc5e9d5a972250da70a003;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 --- 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 - EnableGestureDetection(Gesture::Type(Gesture::Pan)); + EnableGestureDetection(GestureType::Value(GestureType::PAN)); } 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() ) { - case Gesture::Started: + case GestureState::STARTED: { // 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; } - case Gesture::Continuing: + case GestureState::CONTINUING: { PanContinuing( SetPanPosition( gesture.GetPosition() ) ); // pass in the pan position in the local page coordinate break; } - case Gesture::Finished: - case Gesture::Cancelled: + case GestureState::FINISHED: + case GestureState::CANCELLED: { PanFinished( SetPanPosition( gesture.GetPosition() ), gesture.GetSpeed() ); break; } - case Gesture::Clear: - case Gesture::Possible: + case GestureState::CLEAR: + case GestureState::POSSIBLE: default: { break;