X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fscroll-view%2Fscroll-view-example.cpp;h=1f62db96ea1d260a1d076087c972e4e8422f70eb;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=ab7789ab965a0ffee84be3e5f59ebce4100b14a5;hpb=cc6ea8d9723ab3a5415bb550acfbf27501de7a62;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index ab7789a..1f62db9 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -19,99 +19,97 @@ #include // INTERNAL INCLUDES -#include "shared/view.h" -#include #include +#include +#include "shared/view.h" using namespace Dali; using namespace Dali::Toolkit; namespace { -const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-default.png" ); -const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); -const char * const APPLICATION_TITLE( "ScrollView" ); -const char * const EFFECT_CAROUSEL_IMAGE( DEMO_IMAGE_DIR "icon-scroll-view-carousel.png" ); -const char * const EFFECT_CAROUSEL_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-scroll-view-carousel-selected.png" ); -const char * const EFFECT_CUBE_IMAGE( DEMO_IMAGE_DIR "icon-scroll-view-inner-cube.png" ); -const char * const EFFECT_CUBE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-scroll-view-inner-cube-selected.png" ); -const char * const EFFECT_SPIRAL_IMAGE( DEMO_IMAGE_DIR "icon-scroll-view-spiral.png" ); -const char * const EFFECT_SPIRAL_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-scroll-view-spiral-selected.png" ); -const char * const EFFECT_WAVE_IMAGE( DEMO_IMAGE_DIR "icon-effect-wave.png" ); -const char * const EFFECT_WAVE_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-effect-wave-selected.png" ); +const char* const BACKGROUND_IMAGE(DEMO_IMAGE_DIR "background-default.png"); +const char* const TOOLBAR_IMAGE(DEMO_IMAGE_DIR "top-bar.png"); +const char* const APPLICATION_TITLE("ScrollView"); +const char* const EFFECT_CAROUSEL_IMAGE(DEMO_IMAGE_DIR "icon-scroll-view-carousel.png"); +const char* const EFFECT_CAROUSEL_IMAGE_SELECTED(DEMO_IMAGE_DIR "icon-scroll-view-carousel-selected.png"); +const char* const EFFECT_CUBE_IMAGE(DEMO_IMAGE_DIR "icon-scroll-view-inner-cube.png"); +const char* const EFFECT_CUBE_IMAGE_SELECTED(DEMO_IMAGE_DIR "icon-scroll-view-inner-cube-selected.png"); +const char* const EFFECT_SPIRAL_IMAGE(DEMO_IMAGE_DIR "icon-scroll-view-spiral.png"); +const char* const EFFECT_SPIRAL_IMAGE_SELECTED(DEMO_IMAGE_DIR "icon-scroll-view-spiral-selected.png"); +const char* const EFFECT_WAVE_IMAGE(DEMO_IMAGE_DIR "icon-effect-wave.png"); +const char* const EFFECT_WAVE_IMAGE_SELECTED(DEMO_IMAGE_DIR "icon-effect-wave-selected.png"); const Vector3 ICON_SIZE(100.0f, 100.0f, 0.0f); const char* EFFECT_MODE_NAME[] = { - "PageCarousel", - "PageCube", - "PageSpiral", - "PageWave" -}; - -const char * const IMAGE_PATHS[] = { - DEMO_IMAGE_DIR "gallery-medium-1.jpg", - DEMO_IMAGE_DIR "gallery-medium-2.jpg", - DEMO_IMAGE_DIR "gallery-medium-3.jpg", - DEMO_IMAGE_DIR "gallery-medium-4.jpg", - DEMO_IMAGE_DIR "gallery-medium-5.jpg", - DEMO_IMAGE_DIR "gallery-medium-6.jpg", - DEMO_IMAGE_DIR "gallery-medium-7.jpg", - DEMO_IMAGE_DIR "gallery-medium-8.jpg", - DEMO_IMAGE_DIR "gallery-medium-9.jpg", - DEMO_IMAGE_DIR "gallery-medium-10.jpg", - DEMO_IMAGE_DIR "gallery-medium-11.jpg", - DEMO_IMAGE_DIR "gallery-medium-12.jpg", - DEMO_IMAGE_DIR "gallery-medium-13.jpg", - DEMO_IMAGE_DIR "gallery-medium-14.jpg", - DEMO_IMAGE_DIR "gallery-medium-15.jpg", - DEMO_IMAGE_DIR "gallery-medium-16.jpg", - DEMO_IMAGE_DIR "gallery-medium-17.jpg", - DEMO_IMAGE_DIR "gallery-medium-18.jpg", - DEMO_IMAGE_DIR "gallery-medium-19.jpg", - DEMO_IMAGE_DIR "gallery-medium-20.jpg", - DEMO_IMAGE_DIR "gallery-medium-21.jpg", - DEMO_IMAGE_DIR "gallery-medium-22.jpg", - DEMO_IMAGE_DIR "gallery-medium-23.jpg", - DEMO_IMAGE_DIR "gallery-medium-24.jpg", - DEMO_IMAGE_DIR "gallery-medium-25.jpg", - DEMO_IMAGE_DIR "gallery-medium-26.jpg", - DEMO_IMAGE_DIR "gallery-medium-27.jpg", - DEMO_IMAGE_DIR "gallery-medium-28.jpg", - DEMO_IMAGE_DIR "gallery-medium-29.jpg", - DEMO_IMAGE_DIR "gallery-medium-30.jpg", - DEMO_IMAGE_DIR "gallery-medium-31.jpg", - DEMO_IMAGE_DIR "gallery-medium-32.jpg", - DEMO_IMAGE_DIR "gallery-medium-33.jpg", - DEMO_IMAGE_DIR "gallery-medium-34.jpg", - DEMO_IMAGE_DIR "gallery-medium-35.jpg", - DEMO_IMAGE_DIR "gallery-medium-36.jpg", - DEMO_IMAGE_DIR "gallery-medium-37.jpg", - DEMO_IMAGE_DIR "gallery-medium-38.jpg", - DEMO_IMAGE_DIR "gallery-medium-39.jpg", - DEMO_IMAGE_DIR "gallery-medium-40.jpg", - DEMO_IMAGE_DIR "gallery-medium-41.jpg", - DEMO_IMAGE_DIR "gallery-medium-42.jpg", - DEMO_IMAGE_DIR "gallery-medium-43.jpg", - DEMO_IMAGE_DIR "gallery-medium-44.jpg", - DEMO_IMAGE_DIR "gallery-medium-45.jpg", - DEMO_IMAGE_DIR "gallery-medium-46.jpg", - DEMO_IMAGE_DIR "gallery-medium-47.jpg", - DEMO_IMAGE_DIR "gallery-medium-48.jpg", - DEMO_IMAGE_DIR "gallery-medium-49.jpg", - DEMO_IMAGE_DIR "gallery-medium-50.jpg", - DEMO_IMAGE_DIR "gallery-medium-51.jpg", - DEMO_IMAGE_DIR "gallery-medium-52.jpg", - DEMO_IMAGE_DIR "gallery-medium-53.jpg", - - NULL -}; - -const char * const GetNextImagePath() + "PageCarousel", + "PageCube", + "PageSpiral", + "PageWave"}; + +const char* const IMAGE_PATHS[] = { + DEMO_IMAGE_DIR "gallery-medium-1.jpg", + DEMO_IMAGE_DIR "gallery-medium-2.jpg", + DEMO_IMAGE_DIR "gallery-medium-3.jpg", + DEMO_IMAGE_DIR "gallery-medium-4.jpg", + DEMO_IMAGE_DIR "gallery-medium-5.jpg", + DEMO_IMAGE_DIR "gallery-medium-6.jpg", + DEMO_IMAGE_DIR "gallery-medium-7.jpg", + DEMO_IMAGE_DIR "gallery-medium-8.jpg", + DEMO_IMAGE_DIR "gallery-medium-9.jpg", + DEMO_IMAGE_DIR "gallery-medium-10.jpg", + DEMO_IMAGE_DIR "gallery-medium-11.jpg", + DEMO_IMAGE_DIR "gallery-medium-12.jpg", + DEMO_IMAGE_DIR "gallery-medium-13.jpg", + DEMO_IMAGE_DIR "gallery-medium-14.jpg", + DEMO_IMAGE_DIR "gallery-medium-15.jpg", + DEMO_IMAGE_DIR "gallery-medium-16.jpg", + DEMO_IMAGE_DIR "gallery-medium-17.jpg", + DEMO_IMAGE_DIR "gallery-medium-18.jpg", + DEMO_IMAGE_DIR "gallery-medium-19.jpg", + DEMO_IMAGE_DIR "gallery-medium-20.jpg", + DEMO_IMAGE_DIR "gallery-medium-21.jpg", + DEMO_IMAGE_DIR "gallery-medium-22.jpg", + DEMO_IMAGE_DIR "gallery-medium-23.jpg", + DEMO_IMAGE_DIR "gallery-medium-24.jpg", + DEMO_IMAGE_DIR "gallery-medium-25.jpg", + DEMO_IMAGE_DIR "gallery-medium-26.jpg", + DEMO_IMAGE_DIR "gallery-medium-27.jpg", + DEMO_IMAGE_DIR "gallery-medium-28.jpg", + DEMO_IMAGE_DIR "gallery-medium-29.jpg", + DEMO_IMAGE_DIR "gallery-medium-30.jpg", + DEMO_IMAGE_DIR "gallery-medium-31.jpg", + DEMO_IMAGE_DIR "gallery-medium-32.jpg", + DEMO_IMAGE_DIR "gallery-medium-33.jpg", + DEMO_IMAGE_DIR "gallery-medium-34.jpg", + DEMO_IMAGE_DIR "gallery-medium-35.jpg", + DEMO_IMAGE_DIR "gallery-medium-36.jpg", + DEMO_IMAGE_DIR "gallery-medium-37.jpg", + DEMO_IMAGE_DIR "gallery-medium-38.jpg", + DEMO_IMAGE_DIR "gallery-medium-39.jpg", + DEMO_IMAGE_DIR "gallery-medium-40.jpg", + DEMO_IMAGE_DIR "gallery-medium-41.jpg", + DEMO_IMAGE_DIR "gallery-medium-42.jpg", + DEMO_IMAGE_DIR "gallery-medium-43.jpg", + DEMO_IMAGE_DIR "gallery-medium-44.jpg", + DEMO_IMAGE_DIR "gallery-medium-45.jpg", + DEMO_IMAGE_DIR "gallery-medium-46.jpg", + DEMO_IMAGE_DIR "gallery-medium-47.jpg", + DEMO_IMAGE_DIR "gallery-medium-48.jpg", + DEMO_IMAGE_DIR "gallery-medium-49.jpg", + DEMO_IMAGE_DIR "gallery-medium-50.jpg", + DEMO_IMAGE_DIR "gallery-medium-51.jpg", + DEMO_IMAGE_DIR "gallery-medium-52.jpg", + DEMO_IMAGE_DIR "gallery-medium-53.jpg", + + NULL}; + +const char* const GetNextImagePath() { - static const char * const * imagePtr = &IMAGE_PATHS[0]; + static const char* const* imagePtr = &IMAGE_PATHS[0]; - if ( *(++imagePtr) == NULL ) + if(*(++imagePtr) == NULL) { imagePtr = &IMAGE_PATHS[0]; } @@ -119,17 +117,17 @@ const char * const GetNextImagePath() return *imagePtr; } -const int PAGE_COLUMNS = 10; ///< Number of Pages going across (columns) -const int PAGE_ROWS = 1; ///< Number of Pages going down (rows) -const int IMAGE_ROWS = 5; ///< Number of Images going down (rows) with a Page +const int PAGE_COLUMNS = 10; ///< Number of Pages going across (columns) +const int PAGE_ROWS = 1; ///< Number of Pages going down (rows) +const int IMAGE_ROWS = 5; ///< Number of Images going down (rows) with a Page -const unsigned int IMAGE_THUMBNAIL_WIDTH = 256; ///< Width of Thumbnail Image in texels -const unsigned int IMAGE_THUMBNAIL_HEIGHT = 256; ///< Height of Thumbnail Image in texels +const unsigned int IMAGE_THUMBNAIL_WIDTH = 256; ///< Width of Thumbnail Image in texels +const unsigned int IMAGE_THUMBNAIL_HEIGHT = 256; ///< Height of Thumbnail Image in texels -const float SPIN_DURATION = 1.0f; ///< Times to spin an Image by upon touching, each spin taking a second. +const float SPIN_DURATION = 1.0f; ///< Times to spin an Image by upon touching, each spin taking a second. -const float EFFECT_SNAP_DURATION(0.66f); ///< Scroll Snap Duration for Effects -const float EFFECT_FLICK_DURATION(0.5f); ///< Scroll Flick Duration for Effects +const float EFFECT_SNAP_DURATION(0.66f); ///< Scroll Snap Duration for Effects +const float EFFECT_FLICK_DURATION(0.5f); ///< Scroll Flick Duration for Effects } // unnamed namespace @@ -139,13 +137,12 @@ const float EFFECT_FLICK_DURATION(0.5f); ///< class ExampleController : public ConnectionTracker { public: - /** * Constructor * @param application class, stored as reference */ - ExampleController( Application& application ) - : mApplication( application ), + ExampleController(Application& application) + : mApplication(application), mView(), mScrolling(false), mEffectMode(PageCarouselEffect) @@ -169,66 +166,65 @@ public: // Creates a default view with a default tool bar. // The view is added to the window. - mContentLayer = DemoHelper::CreateView( app, - mView, - mToolBar, - BACKGROUND_IMAGE, - TOOLBAR_IMAGE, - "" ); - - mEffectIcon[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE; - mEffectIconSelected[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED; - mEffectIcon[ PageCubeEffect ] = EFFECT_CUBE_IMAGE; - mEffectIconSelected[ PageCubeEffect ] = EFFECT_CUBE_IMAGE_SELECTED; - mEffectIcon[ PageSpiralEffect ] = EFFECT_SPIRAL_IMAGE; - mEffectIconSelected[ PageSpiralEffect ] = EFFECT_SPIRAL_IMAGE_SELECTED; - mEffectIcon[ PageWaveEffect ] = EFFECT_WAVE_IMAGE; - mEffectIconSelected[ PageWaveEffect ] = EFFECT_WAVE_IMAGE_SELECTED; + mContentLayer = DemoHelper::CreateView(app, + mView, + mToolBar, + BACKGROUND_IMAGE, + TOOLBAR_IMAGE, + ""); + + mEffectIcon[PageCarouselEffect] = EFFECT_CAROUSEL_IMAGE; + mEffectIconSelected[PageCarouselEffect] = EFFECT_CAROUSEL_IMAGE_SELECTED; + mEffectIcon[PageCubeEffect] = EFFECT_CUBE_IMAGE; + mEffectIconSelected[PageCubeEffect] = EFFECT_CUBE_IMAGE_SELECTED; + mEffectIcon[PageSpiralEffect] = EFFECT_SPIRAL_IMAGE; + mEffectIconSelected[PageSpiralEffect] = EFFECT_SPIRAL_IMAGE_SELECTED; + mEffectIcon[PageWaveEffect] = EFFECT_WAVE_IMAGE; + mEffectIconSelected[PageWaveEffect] = EFFECT_WAVE_IMAGE_SELECTED; // Create a effect change button. (right of toolbar) mEffectChangeButton = Toolkit::PushButton::New(); - mEffectChangeButton.ClickedSignal().Connect( this, &ExampleController::OnEffectTouched ); - mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); + mEffectChangeButton.ClickedSignal().Connect(this, &ExampleController::OnEffectTouched); + mToolBar.AddControl(mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING); // Create the content layer. AddContentLayer(); // Hack to force screen refresh. Animation animation = Animation::New(1.0f); - animation.AnimateTo(Property(mContentLayer, Actor::Property::POSITION), Vector3::ZERO ); + animation.AnimateTo(Property(mContentLayer, Actor::Property::POSITION), Vector3::ZERO); animation.Play(); } private: - /** * Adds content to the ContentLayer. This is everything we see * excluding the toolbar at the top. */ void AddContentLayer() { - Window window = mApplication.GetWindow(); + Window window = mApplication.GetWindow(); Vector2 windowSize = window.GetSize(); mScrollView = ScrollView::New(); - mScrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); - mScrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - mContentLayer.Add( mScrollView ); - mScrollView.SetProperty( Actor::Property::SIZE, windowSize ); - mScrollView.SetAxisAutoLock( true ); - mScrollView.SetAxisAutoLockGradient( 1.0f ); + mScrollView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); + mScrollView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + mContentLayer.Add(mScrollView); + mScrollView.SetProperty(Actor::Property::SIZE, windowSize); + mScrollView.SetAxisAutoLock(true); + mScrollView.SetAxisAutoLockGradient(1.0f); - mScrollView.ScrollStartedSignal().Connect( this, &ExampleController::OnScrollStarted ); - mScrollView.ScrollCompletedSignal().Connect( this, &ExampleController::OnScrollCompleted ); + mScrollView.ScrollStartedSignal().Connect(this, &ExampleController::OnScrollStarted); + mScrollView.ScrollCompletedSignal().Connect(this, &ExampleController::OnScrollCompleted); - for(int row = 0;row::iterator pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter) + for(std::vector::iterator pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter) { Actor page = *pageIter; - ApplyEffectToPage( page, pageCount++ ); + ApplyEffectToPage(page, pageCount++); } } @@ -272,33 +268,33 @@ private: Actor CreatePage() { Actor page = Actor::New(); - page.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - page.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - page.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + page.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); + page.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + page.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); - Window window = mApplication.GetWindow(); + Window window = mApplication.GetWindow(); Vector2 windowSize = window.GetSize(); const float margin = 10.0f; // Calculate the number of images going across (columns) within a page, according to the screen resolution - int imageColumns = round(IMAGE_ROWS * (windowSize.x / windowSize.y)); + int imageColumns = round(IMAGE_ROWS * (windowSize.x / windowSize.y)); const Vector3 imageSize((windowSize.x / imageColumns) - margin, (windowSize.y / IMAGE_ROWS) - margin, 0.0f); - for(int row = 0;rowSetDomain(RulerDomain(0.0f, windowSize.x * PAGE_COLUMNS, false)); rulerY->Disable(); - Dali::Path path = Dali::Path::New(); + Dali::Path path = Dali::Path::New(); Dali::Property::Array points; - points.Resize(3); + points.Resize(3); Dali::Property::Array controlPoints; - controlPoints.Resize(4); + controlPoints.Resize(4); Vector3 forward; - if( mEffectMode == PageCarouselEffect) + if(mEffectMode == PageCarouselEffect) { + points[0] = Vector3(windowSize.x * 0.75, 0.0f, -windowSize.x * 0.75f); + points[1] = Vector3(0.0f, 0.0f, 0.0f); + points[2] = Vector3(-windowSize.x * 0.75f, 0.0f, -windowSize.x * 0.75f); + path.SetProperty(Path::Property::POINTS, points); - points[0] = Vector3( windowSize.x*0.75, 0.0f, -windowSize.x*0.75f); - points[1] = Vector3( 0.0f, 0.0f, 0.0f ); - points[2] = Vector3( -windowSize.x*0.75f, 0.0f, -windowSize.x*0.75f); - path.SetProperty( Path::Property::POINTS, points ); - - controlPoints[0] = Vector3( windowSize.x*0.5f, 0.0f, 0.0f ); - controlPoints[1] = Vector3( windowSize.x*0.5f, 0.0f, 0.0f ); - controlPoints[2] = Vector3(-windowSize.x*0.5f, 0.0f, 0.0f ); - controlPoints[3] = Vector3(-windowSize.x*0.5f, 0.0f, 0.0f ); - path.SetProperty( Path::Property::CONTROL_POINTS, controlPoints ); + controlPoints[0] = Vector3(windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[1] = Vector3(windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[2] = Vector3(-windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[3] = Vector3(-windowSize.x * 0.5f, 0.0f, 0.0f); + path.SetProperty(Path::Property::CONTROL_POINTS, controlPoints); forward = Vector3::ZERO; } - else if( mEffectMode == PageCubeEffect) + else if(mEffectMode == PageCubeEffect) { - points[0] = Vector3( windowSize.x*0.5, 0.0f, windowSize.x*0.5f); - points[1] = Vector3( 0.0f, 0.0f, 0.0f ); - points[2] = Vector3( -windowSize.x*0.5f, 0.0f, windowSize.x*0.5f); - path.SetProperty( Path::Property::POINTS, points ); - - controlPoints[0] = Vector3( windowSize.x*0.5f, 0.0f, windowSize.x*0.3f ); - controlPoints[1] = Vector3( windowSize.x*0.3f, 0.0f, 0.0f ); - controlPoints[2] = Vector3(-windowSize.x*0.3f, 0.0f, 0.0f ); - controlPoints[3] = Vector3(-windowSize.x*0.5f, 0.0f, windowSize.x*0.3f ); - path.SetProperty( Path::Property::CONTROL_POINTS, controlPoints ); - - forward = Vector3(-1.0f,0.0f,0.0f); + points[0] = Vector3(windowSize.x * 0.5, 0.0f, windowSize.x * 0.5f); + points[1] = Vector3(0.0f, 0.0f, 0.0f); + points[2] = Vector3(-windowSize.x * 0.5f, 0.0f, windowSize.x * 0.5f); + path.SetProperty(Path::Property::POINTS, points); + + controlPoints[0] = Vector3(windowSize.x * 0.5f, 0.0f, windowSize.x * 0.3f); + controlPoints[1] = Vector3(windowSize.x * 0.3f, 0.0f, 0.0f); + controlPoints[2] = Vector3(-windowSize.x * 0.3f, 0.0f, 0.0f); + controlPoints[3] = Vector3(-windowSize.x * 0.5f, 0.0f, windowSize.x * 0.3f); + path.SetProperty(Path::Property::CONTROL_POINTS, controlPoints); + + forward = Vector3(-1.0f, 0.0f, 0.0f); } - else if( mEffectMode == PageSpiralEffect) + else if(mEffectMode == PageSpiralEffect) { - points[0] = Vector3( windowSize.x*0.5, 0.0f, -windowSize.x*0.5f); - points[1] = Vector3( 0.0f, 0.0f, 0.0f ); - points[2] = Vector3( -windowSize.x*0.5f, 0.0f, -windowSize.x*0.5f); - path.SetProperty( Path::Property::POINTS, points ); - - controlPoints[0] = Vector3( windowSize.x*0.5f, 0.0f, 0.0f ); - controlPoints[1] = Vector3( windowSize.x*0.5f, 0.0f, 0.0f ); - controlPoints[2] = Vector3(-windowSize.x*0.5f, 0.0f, 0.0f ); - controlPoints[3] = Vector3(-windowSize.x*0.5f, 0.0f, 0.0f ); - path.SetProperty( Path::Property::CONTROL_POINTS, controlPoints ); - - forward = Vector3(-1.0f,0.0f,0.0f); + points[0] = Vector3(windowSize.x * 0.5, 0.0f, -windowSize.x * 0.5f); + points[1] = Vector3(0.0f, 0.0f, 0.0f); + points[2] = Vector3(-windowSize.x * 0.5f, 0.0f, -windowSize.x * 0.5f); + path.SetProperty(Path::Property::POINTS, points); + + controlPoints[0] = Vector3(windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[1] = Vector3(windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[2] = Vector3(-windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[3] = Vector3(-windowSize.x * 0.5f, 0.0f, 0.0f); + path.SetProperty(Path::Property::CONTROL_POINTS, controlPoints); + + forward = Vector3(-1.0f, 0.0f, 0.0f); } - else if( mEffectMode == PageWaveEffect) + else if(mEffectMode == PageWaveEffect) { - points[0] = Vector3( windowSize.x, 0.0f, -windowSize.x); - points[1] = Vector3( 0.0f, 0.0f, 0.0f ); - points[2] = Vector3( -windowSize.x, 0.0f, -windowSize.x); - path.SetProperty( Path::Property::POINTS, points ); - - controlPoints[0] = Vector3( 0.0f, 0.0f, -windowSize.x ); - controlPoints[1] = Vector3( windowSize.x*0.5f, 0.0f, 0.0f ); - controlPoints[2] = Vector3( -windowSize.x*0.5f, 0.0f, 0.0f); - controlPoints[3] = Vector3(0.0f, 0.0f,-windowSize.x ); - path.SetProperty( Path::Property::CONTROL_POINTS, controlPoints ); - - forward = Vector3(-1.0f,0.0f,0.0f); + points[0] = Vector3(windowSize.x, 0.0f, -windowSize.x); + points[1] = Vector3(0.0f, 0.0f, 0.0f); + points[2] = Vector3(-windowSize.x, 0.0f, -windowSize.x); + path.SetProperty(Path::Property::POINTS, points); + + controlPoints[0] = Vector3(0.0f, 0.0f, -windowSize.x); + controlPoints[1] = Vector3(windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[2] = Vector3(-windowSize.x * 0.5f, 0.0f, 0.0f); + controlPoints[3] = Vector3(0.0f, 0.0f, -windowSize.x); + path.SetProperty(Path::Property::CONTROL_POINTS, controlPoints); + + forward = Vector3(-1.0f, 0.0f, 0.0f); } - mScrollViewEffect = ScrollViewPagePathEffect::New(path, forward,Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(windowSize.x,windowSize.y,0.0f),PAGE_COLUMNS); + mScrollViewEffect = ScrollViewPagePathEffect::New(path, forward, Toolkit::ScrollView::Property::SCROLL_FINAL_X, Vector3(windowSize.x, windowSize.y, 0.0f), PAGE_COLUMNS); mScrollView.SetScrollSnapDuration(EFFECT_SNAP_DURATION); mScrollView.SetScrollFlickDuration(EFFECT_FLICK_DURATION); mScrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_OUT); @@ -398,19 +393,19 @@ private: mScrollView.RemoveConstraintsFromChildren(); rulerX = CreateRuler(snap ? windowSize.width * 0.5f : 0.0f); - rulerX->SetDomain( RulerDomain( 0.0f, windowSize.x * 0.5f * PAGE_COLUMNS, false ) ); + rulerX->SetDomain(RulerDomain(0.0f, windowSize.x * 0.5f * PAGE_COLUMNS, false)); unsigned int currentPage = mScrollView.GetCurrentPage(); - if( mScrollViewEffect ) + if(mScrollViewEffect) { mScrollView.ApplyEffect(mScrollViewEffect); } - mScrollView.SetWrapMode( true ); - mScrollView.SetRulerX( rulerX ); - mScrollView.SetRulerY( rulerY ); + mScrollView.SetWrapMode(true); + mScrollView.SetRulerX(rulerX); + mScrollView.SetRulerY(rulerY); - mScrollView.ScrollTo( currentPage, 0.0f ); + mScrollView.ScrollTo(currentPage, 0.0f); } /** @@ -426,7 +421,7 @@ private: { if(gridSize <= Math::MACHINE_EPSILON_0) { - return new DefaultRuler(); + return new DefaultRuler(); } return new FixedRuler(gridSize); } @@ -437,14 +432,14 @@ private: * * @param[in] page The page Actor to apply effect to. */ - void ApplyEffectToPage(Actor page, unsigned int pageOrder ) - { - page.RemoveConstraints(); - page.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + void ApplyEffectToPage(Actor page, unsigned int pageOrder) + { + page.RemoveConstraints(); + page.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - ScrollViewPagePathEffect effect = ScrollViewPagePathEffect::DownCast( mScrollViewEffect ); - effect.ApplyToPage( page, pageOrder ); - } + ScrollViewPagePathEffect effect = ScrollViewPagePathEffect::DownCast(mScrollViewEffect); + effect.ApplyToPage(page, pageOrder); + } /** * Creates an Image (Helper) @@ -453,23 +448,23 @@ private: * @param[in] width the width of the image in texels * @param[in] height the height of the image in texels. */ - ImageView CreateImage( const std::string& filename, int width = IMAGE_THUMBNAIL_WIDTH, int height = IMAGE_THUMBNAIL_HEIGHT ) + ImageView CreateImage(const std::string& filename, int width = IMAGE_THUMBNAIL_WIDTH, int height = IMAGE_THUMBNAIL_HEIGHT) { - ImageView actor = ImageView::New(); + ImageView actor = ImageView::New(); Property::Map map; - map[Visual::Property::TYPE] = Visual::IMAGE; - map[ImageVisual::Property::URL] = filename; - map[ImageVisual::Property::DESIRED_WIDTH] = width; + map[Visual::Property::TYPE] = Visual::IMAGE; + map[ImageVisual::Property::URL] = filename; + map[ImageVisual::Property::DESIRED_WIDTH] = width; map[ImageVisual::Property::DESIRED_HEIGHT] = height; - map[ImageVisual::Property::FITTING_MODE] = FittingMode::SCALE_TO_FILL; - map[ImageVisual::Property::SAMPLING_MODE] = SamplingMode::BOX_THEN_LINEAR; - actor.SetProperty( ImageView::Property::IMAGE, map ); + map[ImageVisual::Property::FITTING_MODE] = FittingMode::SCALE_TO_FILL; + map[ImageVisual::Property::SAMPLING_MODE] = SamplingMode::BOX_THEN_LINEAR; + actor.SetProperty(ImageView::Property::IMAGE, map); - actor.SetProperty( Dali::Actor::Property::NAME, filename ); - actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); + actor.SetProperty(Dali::Actor::Property::NAME, filename); + actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); - actor.TouchSignal().Connect( this, &ExampleController::OnTouchImage ); + actor.TouchedSignal().Connect(this, &ExampleController::OnTouchImage); return actor; } @@ -478,7 +473,7 @@ private: * note this state (mScrolling = true) * @param[in] position Current Scroll Position */ - void OnScrollStarted( const Vector2& position ) + void OnScrollStarted(const Vector2& position) { mScrolling = true; } @@ -488,7 +483,7 @@ private: * note this state (mScrolling = false) * @param[in] position Current Scroll Position */ - void OnScrollCompleted( const Vector2& position ) + void OnScrollCompleted(const Vector2& position) { mScrolling = false; } @@ -499,15 +494,15 @@ private: * @param[in] actor The actor touched * @param[in] event The touch information. */ - bool OnTouchImage( Actor actor, const TouchData& event ) + bool OnTouchImage(Actor actor, const TouchEvent& event) { - if( (event.GetPointCount() > 0) && (!mScrolling) ) + if((event.GetPointCount() > 0) && (!mScrolling)) { - if( event.GetState( 0 ) == PointState::UP ) + if(event.GetState(0) == PointState::UP) { // Spin the Image a few times. Animation animation = Animation::New(SPIN_DURATION); - animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f * SPIN_DURATION) ), Vector3::XAXIS ), AlphaFunction::EASE_OUT ); + animation.AnimateBy(Property(actor, Actor::Property::ORIENTATION), Quaternion(Radian(Degree(360.0f * SPIN_DURATION)), Vector3::XAXIS), AlphaFunction::EASE_OUT); animation.Play(); } } @@ -534,12 +529,12 @@ private: { if(!mTitleActor) { - mTitleActor = DemoHelper::CreateToolBarLabel( "" ); + mTitleActor = DemoHelper::CreateToolBarLabel(""); // Add title to the tool bar. - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter ); + mToolBar.AddControl(mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER); } - mTitleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, title ); + mTitleActor.SetProperty(Toolkit::TextLabel::Property::TEXT, title); } /** @@ -547,9 +542,9 @@ private: */ void OnKeyEvent(const KeyEvent& event) { - if(event.state == KeyEvent::Down) + if(event.GetState() == KeyEvent::DOWN) { - if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) + if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK)) { mApplication.Quit(); } @@ -557,40 +552,39 @@ private: } private: - - Application& mApplication; ///< Application instance - Toolkit::Control mView; ///< The View instance. - Toolkit::ToolBar mToolBar; ///< The View's Toolbar. - TextLabel mTitleActor; ///< The Toolbar's Title. - Layer mContentLayer; ///< The content layer (contains game actors) - ScrollView mScrollView; ///< ScrollView UI Component - bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary) - ScrollViewEffect mScrollViewEffect; ///< ScrollView Effect instance. - std::vector< Actor > mPages; ///< Keeps track of all the pages for applying effects. + Application& mApplication; ///< Application instance + Toolkit::Control mView; ///< The View instance. + Toolkit::ToolBar mToolBar; ///< The View's Toolbar. + TextLabel mTitleActor; ///< The Toolbar's Title. + Layer mContentLayer; ///< The content layer (contains game actors) + ScrollView mScrollView; ///< ScrollView UI Component + bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary) + ScrollViewEffect mScrollViewEffect; ///< ScrollView Effect instance. + std::vector mPages; ///< Keeps track of all the pages for applying effects. /** * Enumeration of different effects this scrollview can operate under. */ enum EffectMode { - PageCarouselEffect, ///< Page carousel effect - PageCubeEffect, ///< Page cube effect - PageSpiralEffect, ///< Page spiral effect - PageWaveEffect, ///< Page wave effect + PageCarouselEffect, ///< Page carousel effect + PageCubeEffect, ///< Page cube effect + PageSpiralEffect, ///< Page spiral effect + PageWaveEffect, ///< Page wave effect Total }; - EffectMode mEffectMode; ///< Current Effect mode + EffectMode mEffectMode; ///< Current Effect mode - std::string mEffectIcon[Total]; ///< Icons for the effect button - std::string mEffectIconSelected[Total]; ///< Icons for the effect button when its selected - Toolkit::PushButton mEffectChangeButton; ///< Effect Change Button + std::string mEffectIcon[Total]; ///< Icons for the effect button + std::string mEffectIconSelected[Total]; ///< Icons for the effect button when its selected + Toolkit::PushButton mEffectChangeButton; ///< Effect Change Button }; -int DALI_EXPORT_API main(int argc, char **argv) +int DALI_EXPORT_API main(int argc, char** argv) { - Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); ExampleController test(app); app.MainLoop(); return 0;