X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=demo%2Fdali-table-view.cpp;h=9577a2e7b4900e6c2fea40b18e78deb4e28f870e;hb=3f93d68f9608bb516ab3fe148a9705ac1b00a4aa;hp=847ddddefe15e7b16a1242f41952cc153d840652;hpb=3616ba1d6b9a38906fd15cf1512d457f2989af42;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 847dddd..9577a2e 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include // INTERNAL INCLUDES #include "shared/view.h" @@ -65,6 +68,8 @@ const float EFFECT_SNAP_DURATION = 0.66f; ///< Scroll Snap const float EFFECT_FLICK_DURATION = 0.5f; ///< Scroll Flick Duration for Effects const Vector3 ANGLE_CUBE_PAGE_ROTATE(Math::PI * 0.5f, Math::PI * 0.5f, 0.0f); + + const int NUM_BACKGROUND_IMAGES = 18; const float BACKGROUND_SWIPE_SCALE = 0.025f; const float BACKGROUND_SPREAD_SCALE = 1.5f; @@ -80,21 +85,6 @@ const Vector4 BACKGROUND_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); const float BUBBLE_MIN_Z = -1.0; const float BUBBLE_MAX_Z = 0.0f; -// 3D Effect constants -const Vector2 ANGLE_SWING_3DEFFECT( Math::PI_2 * 0.75, Math::PI_2 * 0.75f ); ///< Angle Swing in radians -const Vector2 POSITION_SWING_3DEFFECT( 0.55f, 0.4f ); ///< Position Swing relative to stage size. -const Vector3 ANCHOR_3DEFFECT_STYLE0( -105.0f, 30.0f, -240.0f ); ///< Rotation Anchor position for 3D Effect (Style 0) -const Vector3 ANCHOR_3DEFFECT_STYLE1( 65.0f, -70.0f, -500.0f ); ///< Rotation Anchor position for 3D Effect (Style 1) - -const Dali::Vector4 TABLE_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f); - -Vector3 ScalePointSize(const Vector3& vec) -{ - return Vector3( DemoHelper::ScalePointSize( vec.x ), DemoHelper::ScalePointSize( vec.y ), DemoHelper::ScalePointSize( vec.z ) ); -} - -#define DP(x) DemoHelper::ScalePointSize(x) - /** * Creates the background image */ @@ -123,26 +113,26 @@ const float IMAGE_BORDER_BOTTOM = IMAGE_BORDER_LEFT; struct AnimateBubbleConstraint { public: - AnimateBubbleConstraint( const Vector3& initialPos, float scale, float size ) + AnimateBubbleConstraint( const Vector3& initialPos, float scale ) : mInitialX( initialPos.x ), - mScale( scale ), - mShapeSize( size ) + mScale( scale ) { } void operator()( Vector3& position, const PropertyInputContainer& inputs ) { const Vector3& parentSize = inputs[1]->GetVector3(); + const Vector3& childSize = inputs[2]->GetVector3(); // Wrap bubbles verically. - if( position.y + mShapeSize * 0.5f < -parentSize.y * 0.5f ) + if( position.y + childSize.y * 0.5f < -parentSize.y * 0.5f ) { - position.y = parentSize.y * 0.5f + mShapeSize * 0.5f; + position.y = parentSize.y * 0.5f + childSize.y * 0.5f; } // Bubbles X position moves parallax to horizontal // panning by a scale factor unique to each bubble. - position.x = mInitialX + ( inputs[0]->GetVector3().x * mScale ); + position.x = mInitialX + ( inputs[0]->GetVector2().x * mScale ); } private: @@ -214,8 +204,6 @@ void DaliTableView::SortAlphabetically( bool sortAlphabetically ) void DaliTableView::Initialize( Application& application ) { - DemoHelper::RequestThemeChange(); - Stage::GetCurrent().KeyEventSignal().Connect( this, &DaliTableView::OnKeyEvent ); const Vector2 stageSize = Stage::GetCurrent().GetSize(); @@ -267,7 +255,6 @@ void DaliTableView::Initialize( Application& application ) // scrollview occupying the majority of the screen mScrollView = ScrollView::New(); - mScrollView.SetRelayoutEnabled( true ); mScrollView.SetAnchorPoint( AnchorPoint::CENTER ); mScrollView.SetParentOrigin( ParentOrigin::CENTER ); @@ -297,7 +284,6 @@ void DaliTableView::Initialize( Application& application ) // Populate background and bubbles - needs to be scrollViewLayer so scroll ends show Actor bubbleContainer = Actor::New(); - bubbleContainer.SetRelayoutEnabled( true ); bubbleContainer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); bubbleContainer.SetAnchorPoint( AnchorPoint::CENTER ); bubbleContainer.SetParentOrigin( ParentOrigin::CENTER ); @@ -322,7 +308,7 @@ void DaliTableView::Initialize( Application& application ) Populate(); // Remove constraints for inner cube effect - ApplyCubeEffectToActors(); + ApplyCubeEffectToPages(); Dali::Window winHandle = application.GetWindow(); winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT ); @@ -350,21 +336,14 @@ void DaliTableView::Initialize( Application& application ) KeyboardFocusManager::Get().FocusedActorActivatedSignal().Connect( this, &DaliTableView::OnFocusedActorActivated ); } -void DaliTableView::ApplyCubeEffectToActors() +void DaliTableView::ApplyCubeEffectToPages() { - for( ActorIter pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter ) + ScrollViewPagePathEffect effect = ScrollViewPagePathEffect::DownCast( mScrollViewEffect ); + unsigned int pageCount(0); + for( std::vector< Actor >::iterator pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter ) { Actor page = *pageIter; - - for( unsigned int i = 0, numChildren = page.GetChildCount(); i < numChildren; ++i) - { - // Remove old effect's manual constraints. - Actor child = page.GetChildAt(i); - if( child ) - { - ApplyCubeEffectToActor( child ); - } - } + effect.ApplyToPage( page, pageCount++ ); } } @@ -450,9 +429,9 @@ void DaliTableView::Populate() } // Update Ruler info. - mScrollRulerX = new FixedRuler( stageSize.width * TABLE_RELATIVE_SIZE.x ); + mScrollRulerX = new FixedRuler( stageSize.width * TABLE_RELATIVE_SIZE.x * 0.5f ); mScrollRulerY = new DefaultRuler(); - mScrollRulerX->SetDomain( RulerDomain( 0.0f, mTotalPages * stageSize.width * TABLE_RELATIVE_SIZE.x, true ) ); + mScrollRulerX->SetDomain( RulerDomain( 0.0f, (mTotalPages+1) * stageSize.width * TABLE_RELATIVE_SIZE.x * 0.5f, true ) ); mScrollRulerY->Disable(); mScrollView.SetRulerX( mScrollRulerX ); mScrollView.SetRulerY( mScrollRulerY ); @@ -481,8 +460,8 @@ void DaliTableView::Rotate( unsigned int degrees ) } mRotateAnimation = Animation::New( ROTATE_ANIMATION_TIME ); - mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 - degrees ) ), Vector3::ZAXIS ), AlphaFunctions::EaseOut ); - mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::SIZE ), targetSize, AlphaFunctions::EaseOut ); + mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 - degrees ) ), Vector3::ZAXIS ), AlphaFunction::EASE_OUT ); + mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::SIZE ), targetSize, AlphaFunction::EASE_OUT ); mRotateAnimation.Play(); } @@ -492,7 +471,6 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit content.SetName( name ); content.SetAnchorPoint( AnchorPoint::CENTER ); content.SetParentOrigin( ParentOrigin::CENTER ); - content.SetRelayoutEnabled( true ); content.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); content.SetSizeModeFactor( sizeMultiplier ); @@ -526,7 +504,6 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); label.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); - label.SetColor( TABLE_TEXT_STYLE_COLOR ); content.Add( label ); // Set the tile to be keyboard focusable @@ -595,9 +572,9 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event ) // scale the content actor within the Tile, as to not affect the placement within the Table. Actor content = actor.GetChildAt(0); - mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3( 0.9f, 0.9f, 1.0f ), AlphaFunctions::EaseInOut, + mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3( 0.9f, 0.9f, 1.0f ), AlphaFunction::EASE_IN_OUT, TimePeriod( 0.0f, BUTTON_PRESS_ANIMATION_TIME * 0.5f ) ); - mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3::ONE, AlphaFunctions::EaseInOut, + mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3::ONE, AlphaFunction::EASE_IN_OUT, TimePeriod( BUTTON_PRESS_ANIMATION_TIME * 0.5f, BUTTON_PRESS_ANIMATION_TIME * 0.5f ) ); mPressedAnimation.Play(); mPressedAnimation.FinishedSignal().Connect( this, &DaliTableView::OnPressedAnimationFinished ); @@ -643,14 +620,14 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation& source ) } } -void DaliTableView::OnScrollStart( const Dali::Vector3& position ) +void DaliTableView::OnScrollStart( const Dali::Vector2& position ) { mScrolling = true; PlayAnimation(); } -void DaliTableView::OnScrollComplete( const Dali::Vector3& position ) +void DaliTableView::OnScrollComplete( const Dali::Vector2& position ) { mScrolling = false; @@ -687,21 +664,29 @@ void DaliTableView::ApplyScrollViewEffect() void DaliTableView::SetupInnerPageCubeEffect() { - mScrollViewEffect = ScrollViewCubeEffect::New(); - mScrollView.SetScrollSnapDuration( EFFECT_SNAP_DURATION ); - mScrollView.SetScrollFlickDuration( EFFECT_FLICK_DURATION ); - mScrollView.RemoveConstraintsFromChildren(); -} + const Vector2 stageSize = Stage::GetCurrent().GetSize(); + + Dali::Path path = Dali::Path::New(); + Dali::Property::Array points; + points.Resize(3); + points[0] = Vector3( stageSize.x*0.5, 0.0f, stageSize.x*0.5f); + points[1] = Vector3( 0.0f, 0.0f, 0.0f ); + points[2] = Vector3( -stageSize.x*0.5f, 0.0f, stageSize.x*0.5f); + path.SetProperty( Path::Property::POINTS, points ); + + Dali::Property::Array controlPoints; + controlPoints.Resize(4); + controlPoints[0] = Vector3( stageSize.x*0.5f, 0.0f, stageSize.x*0.3f ); + controlPoints[1] = Vector3( stageSize.x*0.3f, 0.0f, 0.0f ); + controlPoints[2] = Vector3(-stageSize.x*0.3f, 0.0f, 0.0f ); + controlPoints[3] = Vector3(-stageSize.x*0.5f, 0.0f, stageSize.x*0.3f ); + path.SetProperty( Path::Property::CONTROL_POINTS, controlPoints ); -void DaliTableView::ApplyCubeEffectToActor( Actor actor ) -{ - actor.RemoveConstraints(); - ScrollViewCubeEffect cubeEffect = ScrollViewCubeEffect::DownCast(mScrollViewEffect); - cubeEffect.ApplyToActor( actor, - ScalePointSize( ( rand() & 1 ) ? ANCHOR_3DEFFECT_STYLE0 : ANCHOR_3DEFFECT_STYLE1 ), - ANGLE_SWING_3DEFFECT, - POSITION_SWING_3DEFFECT * Vector2(Stage::GetCurrent().GetSize())); + mScrollViewEffect = ScrollViewPagePathEffect::New(path, + Vector3(-1.0f,0.0f,0.0f), + Toolkit::ScrollView::Property::SCROLL_FINAL_X, + Vector3(stageSize.x*TABLE_RELATIVE_SIZE.x,stageSize.y*TABLE_RELATIVE_SIZE.y,0.0f),mTotalPages); } void DaliTableView::OnKeyEvent( const KeyEvent& event ) @@ -746,24 +731,23 @@ void DaliTableView::InitialiseBackgroundActors( Actor actor ) { Actor child = actor.GetChildAt( i ); - const Vector3 childSize = child.GetTargetSize(); - // Calculate a random position Vector3 childPos( Random::Range( -size.x * 0.5f * BACKGROUND_SPREAD_SCALE, size.x * 0.5f * BACKGROUND_SPREAD_SCALE ), - Random::Range( -size.y * 0.5f - childSize.height, size.y * 0.5f + childSize.height ), + Random::Range( -size.y, size.y ), Random::Range( BUBBLE_MIN_Z, BUBBLE_MAX_Z ) ); child.SetPosition( childPos ); // Define bubble horizontal parallax and vertical wrapping - Constraint animConstraint = Constraint::New < Vector3 > ( child, Actor::Property::POSITION, AnimateBubbleConstraint( childPos, Random::Range( -0.85f, 0.25f ), childSize.height ) ); + Constraint animConstraint = Constraint::New < Vector3 > ( child, Actor::Property::POSITION, AnimateBubbleConstraint( childPos, Random::Range( -0.85f, 0.25f ) ) ); animConstraint.AddSource( Source( mScrollView, ScrollView::Property::SCROLL_POSITION ) ); animConstraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) ); + animConstraint.AddSource( Dali::LocalSource( Dali::Actor::Property::SIZE ) ); animConstraint.Apply(); // Kickoff animation Animation animation = Animation::New( Random::Range( 40.0f, 80.0f ) ); - animation.AnimateBy( Property( child, Actor::Property::POSITION ), Vector3( 0.0f, -1.0f, 0.0f ), AlphaFunctions::Linear ); + animation.AnimateBy( Property( child, Actor::Property::POSITION ), Vector3( 0.0f, -1.0f, 0.0f ), AlphaFunction::LINEAR ); animation.SetLooping( true ); animation.Play(); mBackgroundAnimations.push_back( animation ); @@ -779,7 +763,6 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis Vector4 randColour( hue, hue * 0.5, 0.0f, Random::Range( 0.3f, 0.6f )); ImageActor dfActor = ImageActor::New( distanceField ); - dfActor.SetRelayoutEnabled( false ); dfActor.SetSize( Vector2( randSize, randSize ) ); dfActor.SetParentOrigin( ParentOrigin::CENTER ); @@ -885,7 +868,7 @@ void DaliTableView::PauseAnimation() { Animation anim = *animIter; - anim.Pause(); + anim.Stop(); } mBackgroundAnimsPlaying = false; @@ -1008,8 +991,6 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap mVersionPopup.HideTail(); mVersionPopup.OutsideTouchedSignal().Connect( this, &DaliTableView::HideVersionPopup ); mVersionPopup.HiddenSignal().Connect( this, &DaliTableView::PopupHidden ); - - mVersionPopup.MarkDirtyForRelayout(); } mVersionPopup.Show();