X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=demo%2Fdali-table-view.cpp;h=6d238333b3c0e5f9f515d6426e6b2c07de346f3c;hb=refs%2Fchanges%2F25%2F86925%2F1;hp=f9e254000106fcc841a3672fd53ef0534eeeb229;hpb=1e8cf4e9b7b912503aee6bc3494217e88d13ef52;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index f9e2540..6d23833 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,17 @@ // CLASS HEADER #include "dali-table-view.h" -#include "examples/shared/view.h" // EXTERNAL INCLUDES #include #include -#include +#include +#include +#include +#include + +// INTERNAL INCLUDES +#include "shared/view.h" using namespace Dali; using namespace Dali::Toolkit; @@ -32,132 +37,41 @@ using namespace Dali::Toolkit; namespace { -const std::string BUTTON_BACKWARD( "Backward" ); -const std::string BUTTON_FORWARD( "Forward" ); -const std::string BUTTON_QUIT( "Quit" ); -const std::string BUTTON_OK( "Ok" ); -const std::string BUTTON_CANCEL( "Cancel" ); - -const std::string DEFAULT_BACKGROUND_IMAGE_PATH( DALI_IMAGE_DIR "background-gradient.jpg" ); -const std::string LOGO_PATH( DALI_IMAGE_DIR "dali-logo.png" ); -const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DALI_IMAGE_DIR "top-bar.png" ); -const std::string BUTTON_BACKGROUND(DALI_IMAGE_DIR "button-background.png"); -const std::string TILE_BACKGROUND(DALI_IMAGE_DIR "item-background.png"); -const std::string TILE_BACKGROUND_ALPHA(DALI_IMAGE_DIR "item-background-alpha.png"); +const std::string LOGO_PATH( DEMO_IMAGE_DIR "Logo-for-demo.png" ); +const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DEMO_IMAGE_DIR "top-bar.png" ); +const std::string TILE_BACKGROUND(DEMO_IMAGE_DIR "item-background.9.png"); +const std::string TILE_BACKGROUND_ALPHA(DEMO_IMAGE_DIR "item-background-alpha.9.png"); const char * const DEFAULT_TOOLBAR_TEXT( "TOUCH TO LAUNCH EXAMPLE" ); +const Vector4 TILE_COLOR( 0.5f, 0.6f, 0.8f, 0.23f ); ///< Color (including alpha) of tile contents. const float BUTTON_PRESS_ANIMATION_TIME = 0.25f; ///< Time to perform button scale effect. const float ROTATE_ANIMATION_TIME = 0.5f; ///< Time to perform rotate effect. const int MAX_PAGES = 256; ///< Maximum pages (arbitrary safety limit) const int EXAMPLES_PER_ROW = 3; const int ROWS_PER_PAGE = 3; const int EXAMPLES_PER_PAGE = EXAMPLES_PER_ROW * ROWS_PER_PAGE; -const float LOGO_MARGIN_RATIO = 0.5f / 0.9f; +const float LOGO_MARGIN_RATIO = 0.1f / 0.3f; const float BOTTOM_PADDING_RATIO = 0.4f / 0.9f; const Vector3 SCROLLVIEW_RELATIVE_SIZE(0.9f, 1.0f, 0.8f ); ///< ScrollView's relative size to its parent -const Vector3 TABLE_RELATIVE_SIZE(0.9f, 0.9f, 0.8f ); ///< TableView's relative size to the entire stage. The Y value means sum of the logo and table relative heights. -const float STENCIL_RELATIVE_SIZE = 1.0f; - -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 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; -const float SCALE_MOD = 1000.0f * Math::PI * 2.0f; -const float SCALE_SPEED = 10.0f; -const float SCALE_SPEED_SIN = 0.1f; - -const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs - -const float BACKGROUND_Z = -1.0f; -const float BACKGROUND_SIZE_SCALE = 1.0f; -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 std::string DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNeue"); -//const std::string DEFAULT_TEXT_STYLE_FONT_STYLE("Regular"); -//const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.7f, 0.7f, 0.7f, 1.0f); - -//const std::string TABLE_TEXT_STYLE_FONT_FAMILY("HelveticaNeue"); -//const std::string TABLE_TEXT_STYLE_FONT_STYLE("Regular"); -//const Dali::PointSize TABLE_TEXT_STYLE_POINT_SIZE( 8.0f ); -//const Dali::TextStyle::Weight TABLE_TEXT_STYLE_WEIGHT(Dali::TextStyle::LIGHT); -//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) +const Vector3 TABLE_RELATIVE_SIZE(0.95f, 0.9f, 0.8f ); ///< TableView's relative size to the entire stage. The Y value means sum of the logo and table relative heights. /** * Creates the background image */ -ImageActor CreateBackground( std::string imagePath ) +Control CreateBackground( std::string stylename ) { - Image image = ResourceImage::New( imagePath ); - ImageActor background = ImageActor::New( image ); - + Control background = Control::New(); + Stage::GetCurrent().Add( background ); + background.SetProperty( Control::Property::STYLE_NAME,stylename); + background.SetName( "BACKGROUND" ); background.SetAnchorPoint( AnchorPoint::CENTER ); background.SetParentOrigin( ParentOrigin::CENTER ); - background.SetZ( -1.0f ); + background.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); return background; } -// These values depend on the tile image -const float IMAGE_BORDER_LEFT = 11.0f; -const float IMAGE_BORDER_RIGHT = IMAGE_BORDER_LEFT; -const float IMAGE_BORDER_TOP = IMAGE_BORDER_LEFT; -const float IMAGE_BORDER_BOTTOM = IMAGE_BORDER_LEFT; - -/** - * Constraint to return a position for a bubble based on the scroll value and vertical wrapping. - */ -struct AnimateBubbleConstraint -{ -public: - AnimateBubbleConstraint( const Vector3& initialPos, float scale, float size ) - : mInitialX( initialPos.x ), - mScale( scale ), - mShapeSize( size ) - { - } - - Vector3 operator()( const Vector3& current, const PropertyInput& scrollProperty, const PropertyInput& parentSize ) - { - Vector3 pos( current ); - - // Wrap bubbles verically. - if( pos.y + mShapeSize * 0.5f < -parentSize.GetVector3().y * 0.5f ) - { - pos.y += parentSize.GetVector3().y + mShapeSize; - } - - // Bubbles X position moves parallax to horizontal - // panning by a scale factor unique to each bubble. - pos.x = mInitialX + ( scrollProperty.GetVector3().x * mScale ); - return pos; - } - -private: - float mInitialX; - float mScale; - float mShapeSize; -}; - bool CompareByTitle( const Example& lhs, const Example& rhs ) { return lhs.title < rhs.title; @@ -166,11 +80,24 @@ bool CompareByTitle( const Example& lhs, const Example& rhs ) } // namespace DaliTableView::DaliTableView( Application& application ) - : mApplication( application ), - mScrolling( false ), - mBackgroundImagePath( DEFAULT_BACKGROUND_IMAGE_PATH ), - mSortAlphabetically( false ), - mBackgroundAnimsPlaying( false ) +: mApplication( application ), + mBackgroundLayer(), + mRootActor(), + mRotateAnimation(), + mPressedAnimation(), + mScrollViewLayer(), + mScrollView(), + mScrollViewEffect(), + mScrollRulerX(), + mScrollRulerY(), + mPressedActor(), + mLogoTapDetector(), + mVersionPopup(), + mPages(), + mExampleList(), + mTotalPages(), + mScrolling( false ), + mSortAlphabetically( false ) { application.InitSignal().Connect( this, &DaliTableView::Initialize ); } @@ -182,12 +109,6 @@ DaliTableView::~DaliTableView() void DaliTableView::AddExample( Example example ) { mExampleList.push_back( example ); - mExampleMap[ example.name ] = example; -} - -void DaliTableView::SetBackgroundPath( std::string imagePath ) -{ - mBackgroundImagePath = imagePath; } void DaliTableView::SortAlphabetically( bool sortAlphabetically ) @@ -201,19 +122,15 @@ void DaliTableView::Initialize( Application& application ) const Vector2 stageSize = Stage::GetCurrent().GetSize(); - TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); - fontClient.SetDpi( 96, 96 ); - // Background - mBackground = CreateBackground( mBackgroundImagePath ); - // set same size as parent actor - mBackground.SetSize( stageSize ); - Stage::GetCurrent().Add( mBackground ); + Control background = CreateBackground( "launcherbackground" ); + Stage::GetCurrent().Add( background ); - // Render entire content as overlays, as is all on same 2D plane. + // Add root actor mRootActor = TableView::New( 4, 1 ); mRootActor.SetAnchorPoint( AnchorPoint::CENTER ); mRootActor.SetParentOrigin( ParentOrigin::CENTER ); + mRootActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); Stage::GetCurrent().Add( mRootActor ); // Toolbar at top @@ -224,47 +141,63 @@ void DaliTableView::Initialize( Application& application ) DemoHelper::DEFAULT_VIEW_STYLE); mRootActor.AddChild( toolBarLayer, TableView::CellPosition( 0, 0 ) ); - const float toolbarHeight = DemoHelper::DEFAULT_VIEW_STYLE.mToolBarHeight; - mRootActor.SetFixedHeight( 0, toolbarHeight ); + mRootActor.SetFitHeight( 0 ); // Add logo - mLogo = CreateLogo( LOGO_PATH ); + ImageView logo = CreateLogo( LOGO_PATH ); + logo.SetName( "LOGO_IMAGE" ); + logo.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); const float paddingHeight = ( ( 1.f-TABLE_RELATIVE_SIZE.y ) * stageSize.y ); const float logoMargin = paddingHeight * LOGO_MARGIN_RATIO; - const float logoHeight = mLogo.GetImage().GetHeight() + logoMargin; - mRootActor.SetFixedHeight( 1, logoHeight ); + + // Show version in a popup when log is tapped + mLogoTapDetector = TapGestureDetector::New(); + mLogoTapDetector.Attach( logo ); + mLogoTapDetector.DetectedSignal().Connect( this, &DaliTableView::OnLogoTapped ); const float bottomMargin = paddingHeight * BOTTOM_PADDING_RATIO; - mButtonsPageRelativeSize = Vector3( TABLE_RELATIVE_SIZE.x, 1.f - ( toolbarHeight + logoHeight + bottomMargin) / stageSize.height, TABLE_RELATIVE_SIZE.z ); - mRootActor.SetFixedHeight( 2, mButtonsPageRelativeSize.y * stageSize.height ); Alignment alignment = Alignment::New(); - alignment.Add(mLogo); + alignment.SetName( "LOGO_ALIGNMENT" ); + alignment.Add( logo ); + alignment.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + alignment.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT ); + Actor alignmentActor = alignment; + alignmentActor.SetPadding( Padding( 0.0f, 0.0f, logoMargin, logoMargin )); mRootActor.AddChild( alignment, TableView::CellPosition( 1, 0 ) ); + mRootActor.SetFitHeight( 1 ); // scrollview occupying the majority of the screen mScrollView = ScrollView::New(); mScrollView.SetAnchorPoint( AnchorPoint::CENTER ); mScrollView.SetParentOrigin( ParentOrigin::CENTER ); - // Note: Currently, changing mScrollView to use SizeMode RELATIVE_TO_PARENT - // will cause scroll ends to appear in the wrong position. - mScrollView.ApplyConstraint( Dali::Constraint::New( Dali::Actor::SIZE, Dali::ParentSource( Dali::Actor::SIZE ), Dali::RelativeToConstraint( SCROLLVIEW_RELATIVE_SIZE ) ) ); + mScrollView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + const float buttonsPageMargin = ( 1.0f - TABLE_RELATIVE_SIZE.x ) * 0.5f * stageSize.width; + mScrollView.SetPadding( Padding( buttonsPageMargin, buttonsPageMargin, 0.0f, 0.0f ) ); + mScrollView.SetAxisAutoLock( true ); mScrollView.ScrollCompletedSignal().Connect( this, &DaliTableView::OnScrollComplete ); mScrollView.ScrollStartedSignal().Connect( this, &DaliTableView::OnScrollStart ); - mScrollView.TouchedSignal().Connect( this, &DaliTableView::OnScrollTouched ); + mScrollView.TouchSignal().Connect( this, &DaliTableView::OnScrollTouched ); mScrollViewLayer = Layer::New(); + + // Disable the depth test for performance + mScrollViewLayer.SetDepthTestDisabled( true ); mScrollViewLayer.SetAnchorPoint( AnchorPoint::CENTER ); mScrollViewLayer.SetParentOrigin( ParentOrigin::CENTER ); - mScrollViewLayer.SetDrawMode( DrawMode::OVERLAY ); + mScrollViewLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - // Populate background and bubbles - needs to be scrollViewLayer so scroll ends show - SetupBackground( mScrollView, mScrollViewLayer, stageSize ); + Alignment buttonsAlignment = Alignment::New(); + buttonsAlignment.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + buttonsAlignment.Add( mScrollViewLayer ); mScrollViewLayer.Add( mScrollView ); - mRootActor.AddChild( mScrollViewLayer, TableView::CellPosition( 2, 0 ) ); + + mRootActor.AddChild( buttonsAlignment, TableView::CellPosition( 2, 0 ) ); + + mRootActor.SetFixedHeight( 3, bottomMargin ); // Add scroll view effect and setup constraints on pages ApplyScrollViewEffect(); @@ -273,11 +206,7 @@ void DaliTableView::Initialize( Application& application ) Populate(); // Remove constraints for inner cube effect - ApplyCubeEffectToActors(); - - // Set initial orientation - unsigned int degrees = application.GetOrientation().GetDegrees(); - Rotate( degrees ); + ApplyCubeEffectToPages(); Dali::Window winHandle = application.GetWindow(); winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT ); @@ -285,40 +214,32 @@ void DaliTableView::Initialize( Application& application ) winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); - Dali::Orientation orientation = winHandle.GetOrientation(); - orientation.ChangedSignal().Connect( this, &DaliTableView::OrientationChanged ); + // Set initial orientation + unsigned int degrees = 0; + Rotate( degrees ); winHandle.ShowIndicator( Dali::Window::INVISIBLE ); - // - mAnimationTimer = Timer::New( BACKGROUND_ANIMATION_DURATION ); - mAnimationTimer.TickSignal().Connect( this, &DaliTableView::PauseBackgroundAnimation ); - mAnimationTimer.Start(); - mBackgroundAnimsPlaying = true; - KeyboardFocusManager::Get().PreFocusChangeSignal().Connect( this, &DaliTableView::OnKeyboardPreFocusChange ); - KeyboardFocusManager::Get().FocusedActorActivatedSignal().Connect( this, &DaliTableView::OnFocusedActorActivated ); + KeyboardFocusManager::Get().FocusedActorEnterKeySignal().Connect( this, &DaliTableView::OnFocusedActorActivated ); + AccessibilityManager::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; - - unsigned int numChildren = page.GetChildCount(); - Actor pageActor = page; - for( unsigned int i=0; iSetDomain( RulerDomain( 0.0f, mTotalPages * stageSize.width * mButtonsPageRelativeSize.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 ); } -void DaliTableView::OrientationChanged( Orientation orientation ) -{ - // TODO: Implement if orientation change required -} - void DaliTableView::Rotate( unsigned int degrees ) { // Resize the root actor @@ -435,84 +343,69 @@ void DaliTableView::Rotate( unsigned int degrees ) } mRotateAnimation = Animation::New( ROTATE_ANIMATION_TIME ); - mRotateAnimation.RotateTo( mRootActor, Degree( 360 - degrees ), Vector3::ZAXIS, AlphaFunctions::EaseOut ); - mRotateAnimation.Resize( mRootActor, 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(); } -Actor DaliTableView::CreateTile( const std::string& name, const std::string& title, const Size& parentSize, bool addBackground ) -{ - Actor tile = Actor::New(); - tile.SetName( name ); - tile.SetAnchorPoint( AnchorPoint::CENTER ); - tile.SetParentOrigin( ParentOrigin::CENTER ); - - // create background image - if( addBackground ) - { - Image bg = ResourceImage::New( TILE_BACKGROUND ); - ImageActor image = ImageActor::New( bg ); - image.SetAnchorPoint( AnchorPoint::CENTER ); - image.SetParentOrigin( ParentOrigin::CENTER ); - // make the image 100% of tile - image.SetSizeMode( SIZE_EQUAL_TO_PARENT ); - // move image back to get text appear in front - image.SetZ( -1 ); - image.SetStyle( ImageActor::STYLE_NINE_PATCH ); - image.SetNinePatchBorder( Vector4( IMAGE_BORDER_LEFT, IMAGE_BORDER_TOP, IMAGE_BORDER_RIGHT, IMAGE_BORDER_BOTTOM ) ); - tile.Add( image ); - - // Add stencil - ImageActor stencil = NewStencilImage(); - stencil.SetSizeMode( SIZE_EQUAL_TO_PARENT ); - image.Add( stencil ); - } - +Actor DaliTableView::CreateTile( const std::string& name, const std::string& title, const Dali::Vector3& sizeMultiplier, const Dali::Vector4& color ) +{ + Actor content = Actor::New(); + content.SetName( name ); + content.SetAnchorPoint( AnchorPoint::CENTER ); + content.SetParentOrigin( ParentOrigin::CENTER ); + content.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); + content.SetSizeModeFactor( sizeMultiplier ); + + // Create background image. + ImageView image = ImageView::New( TILE_BACKGROUND ); + image.SetAnchorPoint( AnchorPoint::CENTER ); + image.SetParentOrigin( ParentOrigin::CENTER ); + // Make the image 100% of tile. + image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + content.Add( image ); + + // Create the tile background. + Actor tileBackground = ImageView::New( TILE_BACKGROUND_ALPHA ); + tileBackground.SetParentOrigin( ParentOrigin::CENTER ); + tileBackground.SetAnchorPoint( AnchorPoint::CENTER ); + tileBackground.SetProperty( Actor::Property::COLOR, color ); + Property::Map shaderEffect = CreateAlphaDiscardEffect(); + tileBackground.SetProperty( Toolkit::ImageView::Property::IMAGE, shaderEffect ); + tileBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + image.Add( tileBackground ); + + // Create the tile label. TextLabel label = TextLabel::New(); - label.SetParentOrigin( ParentOrigin::TOP_LEFT ); label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - label.SetProperty( TextLabel::PROPERTY_MULTI_LINE, true ); - label.SetProperty( TextLabel::PROPERTY_TEXT, title ); - label.SetColor( Color::BLACK ); - tile.Add( label ); - - // FIXME - This is a kludge because size negotiation is not finished - label.SetSize( parentSize ); + label.SetProperty( Control::Property::STYLE_NAME, "launcherlabel" ); + label.SetProperty( TextLabel::Property::MULTI_LINE, true ); + label.SetProperty( TextLabel::Property::TEXT, title ); + label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + label.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); + content.Add( label ); // Set the tile to be keyboard focusable - tile.SetKeyboardFocusable(true); + content.SetKeyboardFocusable(true); // connect to the touch events - tile.TouchedSignal().Connect( this, &DaliTableView::OnTilePressed ); - tile.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered ); + content.TouchSignal().Connect( this, &DaliTableView::OnTilePressed ); + content.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered ); - return tile; + return content; } -ImageActor DaliTableView::NewStencilImage() +bool DaliTableView::OnTilePressed( Actor actor, const TouchData& event ) { - Image alpha = ResourceImage::New( TILE_BACKGROUND_ALPHA ); - - ImageActor stencilActor = ImageActor::New( alpha ); - stencilActor.SetStyle( ImageActor::STYLE_NINE_PATCH ); - stencilActor.SetNinePatchBorder( Vector4( IMAGE_BORDER_LEFT, IMAGE_BORDER_TOP, IMAGE_BORDER_RIGHT, IMAGE_BORDER_BOTTOM ) ); - - stencilActor.SetParentOrigin( ParentOrigin::CENTER ); - stencilActor.SetAnchorPoint( AnchorPoint::CENTER ); - stencilActor.SetDrawMode( DrawMode::STENCIL ); - - Dali::ShaderEffect shaderEffect = AlphaDiscardEffect::New(); - stencilActor.SetShaderEffect( shaderEffect ); - - return stencilActor; + return DoTilePress( actor, event.GetState( 0 ) ); } -bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event ) +bool DaliTableView::DoTilePress( Actor actor, PointState::Type pointState ) { bool consumed = false; - const TouchPoint& point = event.GetPoint( 0 ); - if( TouchPoint::Down == point.state ) + if( PointState::DOWN == pointState ) { mPressedActor = actor; consumed = true; @@ -520,21 +413,22 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event ) // A button press is only valid if the Down & Up events // both occurred within the button. - if( ( TouchPoint::Up == point.state ) && + if( ( PointState::UP == pointState ) && ( mPressedActor == actor ) ) { - std::string name = actor.GetName(); - ExampleMapConstIter iter = mExampleMap.find( name ); - - FocusManager focusManager = FocusManager::Get(); - - if( iter != mExampleMap.end() ) + // ignore Example button presses when scrolling or button animating. + if( ( !mScrolling ) && ( !mPressedAnimation ) ) { - // ignore Example button presses when scrolling or button animating. - if( ( !mScrolling ) && ( !mPressedAnimation ) ) + std::string name = actor.GetName(); + const ExampleListIter end = mExampleList.end(); + for( ExampleListIter iter = mExampleList.begin(); iter != end; ++iter ) { - // do nothing, until pressed animation finished. - consumed = true; + if( (*iter).name == name ) + { + // do nothing, until pressed animation finished. + consumed = true; + break; + } } } @@ -545,10 +439,10 @@ 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.ScaleTo( content, Vector3( 0.9f, 0.9f, 1.0f ), AlphaFunctions::EaseInOut, 0.0f, - BUTTON_PRESS_ANIMATION_TIME * 0.5f ); - mPressedAnimation.ScaleTo( content, Vector3::ONE, AlphaFunctions::EaseInOut, BUTTON_PRESS_ANIMATION_TIME * 0.5f, - BUTTON_PRESS_ANIMATION_TIME * 0.5f ); + 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, 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 ); } @@ -562,59 +456,36 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation& source ) if( mPressedActor ) { std::string name = mPressedActor.GetName(); - ExampleMapConstIter iter = mExampleMap.find( name ); - if( iter == mExampleMap.end() ) + std::stringstream stream; + stream << DEMO_EXAMPLE_BIN << name.c_str(); + pid_t pid = fork(); + if( pid == 0) { - if( name == BUTTON_QUIT ) - { - // Move focus to the OK button - FocusManager focusManager = FocusManager::Get(); - - // Enable the group mode and wrap mode - focusManager.SetGroupMode( true ); - focusManager.SetWrapMode( true ); - } - } - else - { - const Example& example( iter->second ); - - std::stringstream stream; - stream << DALI_EXAMPLE_BIN << example.name.c_str(); - pid_t pid = fork(); - if( pid == 0) - { - execlp( stream.str().c_str(), example.name.c_str(), NULL ); - DALI_ASSERT_ALWAYS(false && "exec failed!"); - } + execlp( stream.str().c_str(), name.c_str(), NULL ); + DALI_ASSERT_ALWAYS(false && "exec failed!"); } mPressedActor.Reset(); } } -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; // move focus to 1st item of new page - FocusManager focusManager = FocusManager::Get(); - focusManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) ); - - ApplyCubeEffectToActors(); + AccessibilityManager accessibilityManager = AccessibilityManager::Get(); + accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) ); } -bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event ) +bool DaliTableView::OnScrollTouched( Actor actor, const TouchData& event ) { - const TouchPoint& point = event.GetPoint( 0 ); - if( TouchPoint::Down == point.state ) + if( PointState::DOWN == event.GetState( 0 ) ) { mPressedActor = actor; } @@ -639,21 +510,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 ) @@ -662,195 +541,31 @@ void DaliTableView::OnKeyEvent( const KeyEvent& event ) { if ( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) { - mApplication.Quit(); - } - } -} - -void DaliTableView::SetupBackground( Actor bubbleContainer, Actor backgroundLayer, const Vector2& size ) -{ - // Create distance field shape. - BitmapImage distanceField; - Size imageSize( 512, 512 ); - CreateShapeImage( CIRCLE, imageSize, distanceField ); - - // Create solid background colour. - ImageActor backgroundColourActor = Dali::Toolkit::CreateSolidColorActor( BACKGROUND_COLOR ); - backgroundColourActor.SetAnchorPoint( AnchorPoint::CENTER ); - backgroundColourActor.SetParentOrigin( ParentOrigin::CENTER ); - backgroundColourActor.SetSize( size * BACKGROUND_SIZE_SCALE ); - backgroundColourActor.SetZ( BACKGROUND_Z ); - backgroundColourActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION ); - backgroundLayer.Add( backgroundColourActor ); - - // Add bubbles to the bubbleContainer. - // Note: The bubbleContainer is parented externally to this function. - AddBackgroundActors( bubbleContainer, NUM_BACKGROUND_IMAGES, distanceField, size ); -} - -void DaliTableView::AddBackgroundActors( Actor layer, int count, BitmapImage distanceField, const Dali::Vector2& size ) -{ - for( int i = 0; i < count; ++i ) - { - float randSize = Random::Range( 10.0f, 400.0f ); - float hue = Random::Range( 0.3f, 1.0f ); - Vector4 randColour( hue, hue*0.5, 0.0f, Random::Range( 0.3f, 0.6f )); - - ImageActor dfActor = ImageActor::New( distanceField ); - mBackgroundActors.push_back( dfActor ); - dfActor.SetSize( Vector2( randSize, randSize ) ); - dfActor.SetParentOrigin( ParentOrigin::CENTER ); - - Toolkit::DistanceFieldEffect effect = Toolkit::DistanceFieldEffect::New(); - dfActor.SetShaderEffect( effect ); - dfActor.SetColor( randColour ); - effect.SetOutlineParams( Vector2( 0.55f, 0.00f ) ); - effect.SetSmoothingEdge( 0.5f ); - layer.Add( dfActor ); - - // Setup animation - Vector3 actorPos( - Random::Range( -size.x * 0.5f * BACKGROUND_SPREAD_SCALE, size.x * 0.5f * BACKGROUND_SPREAD_SCALE ), - Random::Range( -size.y * 0.5f - randSize, size.y * 0.5f + randSize ), - Random::Range( BUBBLE_MIN_Z, BUBBLE_MAX_Z ) ); - dfActor.SetPosition( actorPos ); - - // Define bubble horizontal parallax and vertical wrapping - Constraint animConstraint = Constraint::New < Vector3 > ( Actor::POSITION, - Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ), - Dali::ParentSource( Dali::Actor::SIZE ), - AnimateBubbleConstraint( actorPos, Random::Range( -0.85f, 0.25f ), randSize ) ); - dfActor.ApplyConstraint( animConstraint ); - - // Kickoff animation - Animation animation = Animation::New( Random::Range( 40.0f, 200.0f ) ); - KeyFrames keyframes = KeyFrames::New(); - keyframes.Add( 0.0f, actorPos ); - Vector3 toPos( actorPos ); - toPos.y -= ( size.y + randSize ); - keyframes.Add( 1.0f, toPos ); - animation.AnimateBetween( Property( dfActor, Actor::POSITION ), keyframes ); - animation.SetLooping( true ); - animation.Play(); - mBackgroundAnimations.push_back( animation ); - } -} - -void DaliTableView::CreateShapeImage( ShapeType shapeType, const Size& size, BitmapImage& distanceFieldOut ) -{ - // this bitmap will hold the alpha map for the distance field shader - distanceFieldOut = BitmapImage::New( size.width, size.height, Pixel::A8 ); - - // Generate bit pattern - std::vector< unsigned char > imageDataA8; - imageDataA8.reserve( size.width * size.height ); // A8 - - switch( shapeType ) - { - case CIRCLE: - GenerateCircle( size, imageDataA8 ); - break; - case SQUARE: - GenerateSquare( size, imageDataA8 ); - break; - default: - break; - } - - PixelBuffer* buffer = distanceFieldOut.GetBuffer(); - if( buffer ) - { - GenerateDistanceFieldMap( &imageDataA8[ 0 ], size, buffer, size, 8.0f, size ); - distanceFieldOut.Update(); - } -} - -void DaliTableView::GenerateSquare( const Size& size, std::vector< unsigned char >& distanceFieldOut ) -{ - for( int h = 0; h < size.height; ++h ) - { - for( int w = 0; w < size.width; ++w ) - { - distanceFieldOut.push_back( 0xFF ); - } - } -} - -void DaliTableView::GenerateCircle( const Size& size, std::vector< unsigned char >& distanceFieldOut ) -{ - const float radius = size.width * 0.5f * size.width * 0.5f; - Vector2 center( size.width / 2, size.height / 2 ); - - for( int h = 0; h < size.height; ++h ) - { - for( int w = 0; w < size.width; ++w ) - { - Vector2 pos( w, h ); - Vector2 dist = pos - center; - - if( dist.x * dist.x + dist.y * dist.y > radius ) + // If there's a Popup, Hide it if it's contributing to the display in any way (EG. transitioning in or out). + // Otherwise quit. + if ( mVersionPopup && ( mVersionPopup.GetDisplayState() != Toolkit::Popup::HIDDEN ) ) { - distanceFieldOut.push_back( 0x00 ); + mVersionPopup.SetDisplayState( Popup::HIDDEN ); } else { - distanceFieldOut.push_back( 0xFF ); + mApplication.Quit(); } } } } -ImageActor DaliTableView::CreateLogo( std::string imagePath ) +ImageView DaliTableView::CreateLogo( std::string imagePath ) { - Image image = ResourceImage::New( imagePath ); - ImageActor logo = ImageActor::New( image ); + ImageView logo = ImageView::New( imagePath ); logo.SetAnchorPoint( AnchorPoint::CENTER ); - logo.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); + logo.SetParentOrigin( ParentOrigin::CENTER ); return logo; } -bool DaliTableView::PauseBackgroundAnimation() -{ - PauseAnimation(); - - return false; -} - -void DaliTableView::PauseAnimation() -{ - if( mBackgroundAnimsPlaying ) - { - for( AnimationListIter animIter = mBackgroundAnimations.begin(); animIter != mBackgroundAnimations.end(); ++animIter ) - { - Animation anim = *animIter; - - anim.Pause(); - } - - mBackgroundAnimsPlaying = false; - } -} - -void DaliTableView::PlayAnimation() -{ - if ( !mBackgroundAnimsPlaying ) - { - for( AnimationListIter animIter = mBackgroundAnimations.begin(); animIter != mBackgroundAnimations.end(); ++animIter ) - { - Animation anim = *animIter; - - anim.Play(); - } - - mBackgroundAnimsPlaying = true; - } - - mAnimationTimer.SetInterval( BACKGROUND_ANIMATION_DURATION ); -} - -Dali::Actor DaliTableView::OnKeyboardPreFocusChange( Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction ) +Dali::Actor DaliTableView::OnKeyboardPreFocusChange( Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocus::Direction direction ) { Actor nextFocusActor = proposed; @@ -865,22 +580,22 @@ Dali::Actor DaliTableView::OnKeyboardPreFocusChange( Dali::Actor current, Dali:: // in the given direction. We should work out which page to scroll to next. int currentPage = mScrollView.GetCurrentPage(); int newPage = currentPage; - if( direction == Dali::Toolkit::Control::Left ) + if( direction == Dali::Toolkit::Control::KeyboardFocus::LEFT ) { newPage--; } - else if( direction == Dali::Toolkit::Control::Right ) + else if( direction == Dali::Toolkit::Control::KeyboardFocus::RIGHT ) { newPage++; } - newPage = std::max(0, std::min(static_cast(mScrollRulerX->GetTotalPages() - 1), newPage)); + newPage = std::max(0, std::min(mTotalPages - 1, newPage)); if( newPage == currentPage ) { - if( direction == Dali::Toolkit::Control::Left ) + if( direction == Dali::Toolkit::Control::KeyboardFocus::LEFT ) { - newPage = mScrollRulerX->GetTotalPages() - 1; - } else if( direction == Dali::Toolkit::Control::Right ) + newPage = mTotalPages - 1; + } else if( direction == Dali::Toolkit::Control::KeyboardFocus::RIGHT ) { newPage = 0; } @@ -889,7 +604,7 @@ Dali::Actor DaliTableView::OnKeyboardPreFocusChange( Dali::Actor current, Dali:: // Scroll to the page in the given direction mScrollView.ScrollTo(newPage); - if( direction == Dali::Toolkit::Control::Left ) + if( direction == Dali::Toolkit::Control::KeyboardFocus::LEFT ) { // Work out the cell position for the last tile int remainingExamples = mExampleList.size() - newPage * EXAMPLES_PER_PAGE; @@ -897,7 +612,7 @@ Dali::Actor DaliTableView::OnKeyboardPreFocusChange( Dali::Actor current, Dali:: int colPos = remainingExamples >= EXAMPLES_PER_PAGE ? EXAMPLES_PER_ROW - 1 : ( remainingExamples % EXAMPLES_PER_PAGE - rowPos * EXAMPLES_PER_ROW - 1 ); // Move the focus to the last tile in the new page. - nextFocusActor = mPages[newPage].GetChildAt(colPos * EXAMPLES_PER_ROW + rowPos); + nextFocusActor = mPages[newPage].GetChildAt(rowPos * EXAMPLES_PER_ROW + colPos); } else { @@ -916,9 +631,7 @@ void DaliTableView::OnFocusedActorActivated( Dali::Actor activatedActor ) mPressedActor = activatedActor; // Activate the current focused actor; - TouchEvent touchEventUp; - touchEventUp.points.push_back( TouchPoint ( 0, TouchPoint::Up, 0.0f, 0.0f ) ); - OnTilePressed(mPressedActor, touchEventUp); + DoTilePress( mPressedActor, PointState::UP ); } } @@ -928,4 +641,52 @@ bool DaliTableView::OnTileHovered( Actor actor, const HoverEvent& event ) return true; } +void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap ) +{ + // Only show if currently fully hidden. If transitioning-out, the transition will not be interrupted. + if ( !mVersionPopup || ( mVersionPopup.GetDisplayState() == Toolkit::Popup::HIDDEN ) ) + { + if ( !mVersionPopup ) + { + std::ostringstream stream; + stream << "DALi Core: " << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << std::endl << "(" << CORE_BUILD_DATE << ")\n"; + stream << "DALi Adaptor: " << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << std::endl << "(" << ADAPTOR_BUILD_DATE << ")\n"; + stream << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << std::endl << "(" << TOOLKIT_BUILD_DATE << ")\n"; + + mVersionPopup = Dali::Toolkit::Popup::New(); + + Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( "Version information" ); + titleActor.SetName( "titleActor" ); + titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); + + Toolkit::TextLabel contentActor = Toolkit::TextLabel::New( stream.str() ); + contentActor.SetName( "contentActor" ); + contentActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); + contentActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + contentActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); + contentActor.SetPadding( Padding( 0.0f, 0.0f, 20.0f, 0.0f ) ); + + mVersionPopup.SetTitle( titleActor ); + mVersionPopup.SetContent( contentActor ); + + mVersionPopup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::WIDTH ); + mVersionPopup.SetSizeModeFactor( Vector3( 0.75f, 1.0f, 1.0f ) ); + mVersionPopup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT ); + + mVersionPopup.OutsideTouchedSignal().Connect( this, &DaliTableView::HideVersionPopup ); + Stage::GetCurrent().Add( mVersionPopup ); + } + + mVersionPopup.SetDisplayState( Popup::SHOWN ); + } +} +void DaliTableView::HideVersionPopup() +{ + // Only hide if currently fully shown. If transitioning-in, the transition will not be interrupted. + if ( mVersionPopup && ( mVersionPopup.GetDisplayState() == Toolkit::Popup::SHOWN ) ) + { + mVersionPopup.SetDisplayState( Popup::HIDDEN ); + } +}