/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
#include <algorithm>
#include <sstream>
#include <unistd.h>
+#include <dali/devel-api/images/distance-field.h>
+#include <dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h>
+#include <dali-toolkit/devel-api/shader-effects/distance-field-effect.h>
// INTERNAL INCLUDES
#include "shared/view.h"
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 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 Vector4 BUBBLE_COLOR[] =
+{
+ Vector4( 0.3255f, 0.3412f, 0.6353f, 0.38f ),
+ Vector4( 0.3647f, 0.7569f, 0.8157f, 0.38f ),
+ Vector4( 0.3804f, 0.7412f, 0.6510f, 0.38f ),
+ Vector4( 1.f, 1.f, 1.f, 0.2f )
+};
+const int NUMBER_OF_BUBBLE_COLOR( sizeof(BUBBLE_COLOR) / sizeof(BUBBLE_COLOR[0]) );
+
const int NUM_BACKGROUND_IMAGES = 18;
const float BACKGROUND_SWIPE_SCALE = 0.025f;
const float BACKGROUND_SPREAD_SCALE = 1.5f;
const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs
-const float BACKGROUND_Z = -1.0f;
-const Vector4 BACKGROUND_COLOR( 1.0f, 1.0f, 1.0f, 1.0f );
+const Vector4 BACKGROUND_COLOR( 0.3569f, 0.5451f, 0.7294f, 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::PointSize DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
-const Dali::TextStyle::Weight DEFAULT_TEXT_STYLE_WEIGHT(Dali::TextStyle::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)
-
-TextStyle GetTableTextStyle()
-{
- TextStyle textStyle;
- textStyle.SetFontName(TABLE_TEXT_STYLE_FONT_FAMILY);
- textStyle.SetFontStyle(TABLE_TEXT_STYLE_FONT_STYLE);
- textStyle.SetFontPointSize( Dali::PointSize(DemoHelper::ScalePointSize(TABLE_TEXT_STYLE_POINT_SIZE)));
- textStyle.SetWeight(TABLE_TEXT_STYLE_WEIGHT);
- textStyle.SetTextColor(TABLE_TEXT_STYLE_COLOR);
- return textStyle;
-}
-
/**
* 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( FILL_TO_PARENT, ALL_DIMENSIONS );
+ 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 )
+ AnimateBubbleConstraint( const Vector3& initialPos, float scale )
+ : mInitialX( initialPos.x ),
+ 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 )
- {
- position.y = parentSize.y * 0.5f + mShapeSize * 0.5f;
- }
+ // Wrap bubbles vertically.
+ float range = parentSize.y + childSize.y;
+ // This performs a float mod (we don't use fmod as we want the arithmetic modulus as opposed to the remainder).
+ position.y -= range * ( floor( position.y / range ) + 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:
float mInitialX;
float mScale;
- float mShapeSize;
};
bool CompareByTitle( const Example& lhs, const Example& rhs )
mBackgroundLayer(),
mRootActor(),
mRotateAnimation(),
- mBackground(),
mPressedAnimation(),
mScrollViewLayer(),
mScrollView(),
mScrollViewEffect(),
mScrollRulerX(),
mScrollRulerY(),
- mButtons(),
mPressedActor(),
mAnimationTimer(),
mLogoTapDetector(),
mVersionPopup(),
- mButtonsPageRelativeSize(),
mPages(),
- mTableViewImages(),
- mBackgroundActors(),
mBackgroundAnimations(),
mExampleList(),
- mExampleMap(),
- mBackgroundImagePath( DEFAULT_BACKGROUND_IMAGE_PATH ),
mTotalPages(),
mScrolling( false ),
mSortAlphabetically( false ),
- mBackgroundAnimsPlaying( false ),
- mVersionPopupShown( false )
+ mBackgroundAnimsPlaying( false )
{
application.InitSignal().Connect( this, &DaliTableView::Initialize );
}
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 )
const Vector2 stageSize = Stage::GetCurrent().GetSize();
// Background
- Actor background = CreateBackground( mBackgroundImagePath );
+ 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( FILL_TO_PARENT, ALL_DIMENSIONS );
+ mRootActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Stage::GetCurrent().Add( mRootActor );
// Toolbar at top
Dali::Layer toolBarLayer = DemoHelper::CreateToolbar(toolbar,
DEFAULT_TOOLBAR_IMAGE_PATH,
DEFAULT_TOOLBAR_TEXT,
- DemoHelper::DEFAULT_VIEW_STYLE,
- DemoHelper::GetDefaultTextStyle());
+ DemoHelper::DEFAULT_VIEW_STYLE);
mRootActor.AddChild( toolBarLayer, TableView::CellPosition( 0, 0 ) );
mRootActor.SetFitHeight( 0 );
// Add logo
- Dali::ImageActor logo = CreateLogo( LOGO_PATH );
+ ImageView logo = CreateLogo( LOGO_PATH );
logo.SetName( "LOGO_IMAGE" );
- logo.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
+ 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;
Alignment alignment = Alignment::New();
alignment.SetName( "LOGO_ALIGNMENT" );
alignment.Add( logo );
- alignment.SetResizePolicy( FILL_TO_PARENT, WIDTH );
- alignment.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT );
+ 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 ) );
// scrollview occupying the majority of the screen
mScrollView = ScrollView::New();
- mScrollView.SetRelayoutEnabled( true );
mScrollView.SetAnchorPoint( AnchorPoint::CENTER );
mScrollView.SetParentOrigin( ParentOrigin::CENTER );
- mScrollView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ 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( FILL_TO_PARENT, ALL_DIMENSIONS );
+ mScrollViewLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
// Create solid background colour.
- ImageActor backgroundColourActor = Dali::Toolkit::CreateSolidColorActor( BACKGROUND_COLOR );
+ Control backgroundColourActor = Control::New();
+ backgroundColourActor.SetBackgroundColor( BACKGROUND_COLOR );
backgroundColourActor.SetAnchorPoint( AnchorPoint::CENTER );
backgroundColourActor.SetParentOrigin( ParentOrigin::CENTER );
- backgroundColourActor.SetResizePolicy( SIZE_RELATIVE_TO_PARENT, ALL_DIMENSIONS );
+ backgroundColourActor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
backgroundColourActor.SetSizeModeFactor( Vector3( 1.0f, 1.5f, 1.0f ) );
- backgroundColourActor.SetZ( BACKGROUND_Z );
+
mScrollViewLayer.Add( backgroundColourActor );
// Populate background and bubbles - needs to be scrollViewLayer so scroll ends show
Actor bubbleContainer = Actor::New();
- bubbleContainer.SetRelayoutEnabled( true );
- bubbleContainer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ bubbleContainer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
bubbleContainer.SetAnchorPoint( AnchorPoint::CENTER );
bubbleContainer.SetParentOrigin( ParentOrigin::CENTER );
- mScrollViewLayer.Add( bubbleContainer );
+ backgroundColourActor.Add( bubbleContainer );
SetupBackground( bubbleContainer );
Alignment buttonsAlignment = Alignment::New();
- buttonsAlignment.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ buttonsAlignment.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
buttonsAlignment.Add( mScrollViewLayer );
mScrollViewLayer.Add( mScrollView );
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 );
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 );
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;
-
- 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++ );
}
}
for( int t = 0; t < mTotalPages; t++ )
{
- // Create Table. (contains up to 9 Examples)
- TableView page = TableView::New( 3, 3 );
+ // Create Table
+ TableView page = TableView::New( ROWS_PER_PAGE, EXAMPLES_PER_ROW );
page.SetAnchorPoint( AnchorPoint::CENTER );
page.SetParentOrigin( ParentOrigin::CENTER );
- page.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ page.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
mScrollView.Add( page );
// Calculate the number of images going across (columns) within a page, according to the screen resolution and dpi.
const Example& example = ( *iter );
Actor tile = CreateTile( example.name, example.title, Vector3( tileParentMultiplier, tileParentMultiplier, 1.0f ), true );
- FocusManager focusManager = FocusManager::Get();
- focusManager.SetFocusOrder( tile, ++exampleCount );
- focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_LABEL,
+ AccessibilityManager accessibilityManager = AccessibilityManager::Get();
+ accessibilityManager.SetFocusOrder( tile, ++exampleCount );
+ accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL,
example.title );
- focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_TRAIT, "Tile" );
- focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_HINT,
+ accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_TRAIT, "Tile" );
+ accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_HINT,
"You can run this example" );
tile.SetPadding( Padding( margin, margin, margin, margin ) );
}
// 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 );
}
-void DaliTableView::OrientationChanged( Orientation orientation )
-{
- // TODO: Implement if orientation change required
-}
-
void DaliTableView::Rotate( unsigned int degrees )
{
// Resize the root actor
}
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();
}
content.SetName( name );
content.SetAnchorPoint( AnchorPoint::CENTER );
content.SetParentOrigin( ParentOrigin::CENTER );
- content.SetRelayoutEnabled( true );
- content.SetResizePolicy( SIZE_RELATIVE_TO_PARENT, ALL_DIMENSIONS );
+ content.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
content.SetSizeModeFactor( sizeMultiplier );
// create background image
if( addBackground )
{
- Image bg = ResourceImage::New( TILE_BACKGROUND );
- ImageActor image = ImageActor::New( bg );
+ ImageView image = ImageView::New( TILE_BACKGROUND );
image.SetAnchorPoint( AnchorPoint::CENTER );
image.SetParentOrigin( ParentOrigin::CENTER );
// make the image 100% of tile
- image.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
- // 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 ) );
content.Add( image );
// Add stencil
- ImageActor stencil = NewStencilImage();
- stencil.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+ Toolkit::ImageView stencil = NewStencilImage();
+ stencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
image.Add( stencil );
}
- TextView text = TextView::New( title );
- text.SetAnchorPoint( AnchorPoint::CENTER );
- text.SetParentOrigin( ParentOrigin::CENTER );
- text.SetWidthExceedPolicy( Toolkit::TextView::ShrinkToFit );
- text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
- text.SetLineJustification( Toolkit::TextView::Center );
- text.SetTextAlignment( Toolkit::Alignment::Type( Alignment::HorizontalCenter | Alignment::VerticalCenter ) );
- text.SetZ( 1 );
- // make the text 90% of tile
- text.SetResizePolicy( SIZE_RELATIVE_TO_PARENT, ALL_DIMENSIONS );
- text.SetSizeModeFactor( Vector3( 0.9f, 0.9f, 0.0f ) );
- text.SetStyleToCurrentText( GetTableTextStyle() );
- text.SetSnapshotModeEnabled( false );
- content.Add( text );
+ TextLabel label = TextLabel::New();
+ label.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ 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
content.SetKeyboardFocusable(true);
// connect to the touch events
- content.TouchedSignal().Connect( this, &DaliTableView::OnTilePressed );
+ content.TouchSignal().Connect( this, &DaliTableView::OnTilePressed );
content.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered );
return content;
}
-ImageActor DaliTableView::NewStencilImage()
+Toolkit::ImageView DaliTableView::NewStencilImage()
{
- Image alpha = ResourceImage::New( TILE_BACKGROUND_ALPHA );
+ Toolkit::ImageView stencil = ImageView::New( TILE_BACKGROUND_ALPHA );
+ stencil.SetParentOrigin( ParentOrigin::CENTER );
+ stencil.SetAnchorPoint( AnchorPoint::CENTER );
+ stencil.SetDrawMode( DrawMode::STENCIL );
- 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 ) );
+ Property::Map shaderEffect = CreateAlphaDiscardEffect();
+ stencil.SetProperty( Toolkit::ImageView::Property::IMAGE, shaderEffect );
- stencilActor.SetParentOrigin( ParentOrigin::CENTER );
- stencilActor.SetAnchorPoint( AnchorPoint::CENTER );
- stencilActor.SetDrawMode( DrawMode::STENCIL );
-
- Dali::ShaderEffect shaderEffect = AlphaDiscardEffect::New();
- stencilActor.SetShaderEffect( shaderEffect );
+ return stencil;
+}
- return stencilActor;
+bool DaliTableView::OnTilePressed( Actor actor, const TouchData& event )
+{
+ 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;
// 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;
+ }
}
}
// 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 );
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) );
+ 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;
}
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 )
{
if ( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
{
- if ( mVersionPopup && mVersionPopupShown )
+ // 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 ) )
{
- HideVersionPopup();
+ mVersionPopup.SetDisplayState( Popup::HIDDEN );
}
else
{
{
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.SetRemoveAction( Constraint::Discard );
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 animation = Animation::New( Random::Range( 30.0f, 160.0f ) );
+ animation.AnimateBy( Property( child, Actor::Property::POSITION ), Vector3( 0.0f, -2000.0f, 0.0f ), AlphaFunction::LINEAR );
animation.SetLooping( true );
animation.Play();
mBackgroundAnimations.push_back( animation );
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 );
- dfActor.SetRelayoutEnabled( false );
+ ImageView dfActor = ImageView::New( distanceField );
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 );
+ Dali::Property::Map effect = Toolkit::CreateDistanceFieldEffect();
+ dfActor.SetProperty( Toolkit::ImageView::Property::IMAGE, effect );
+ dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] );
+
layer.Add( dfActor );
}
}
}
-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::CENTER );
{
Animation anim = *animIter;
- anim.Pause();
+ anim.Stop();
}
mBackgroundAnimsPlaying = false;
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;
// 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<int>(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;
}
// 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;
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
{
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 );
}
}
void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap )
{
- if ( !mVersionPopupShown )
+ // 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 << ")" << std::endl << std::endl;
- stream << "DALi Adaptor: " << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << std::endl << "(" << ADAPTOR_BUILD_DATE << ")" << std::endl << std::endl;
- stream << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << std::endl << "(" << TOOLKIT_BUILD_DATE << ")";
+ 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();
- mVersionPopup.SetParentOrigin( ParentOrigin::CENTER );
- mVersionPopup.SetAnchorPoint( AnchorPoint::CENTER );
- mVersionPopup.SetResizePolicy( SIZE_RELATIVE_TO_PARENT, WIDTH );
+
+ Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( "Version information" );
+ titleActor.SetName( "titleActor" );
+ titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+
+ 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.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( FIT_TO_CHILDREN, HEIGHT );
- mVersionPopup.SetTitle( stream.str() );
- mVersionPopup.HideTail();
- mVersionPopup.OutsideTouchedSignal().Connect( this, &DaliTableView::HideVersionPopup );
- mVersionPopup.HiddenSignal().Connect( this, &DaliTableView::PopupHidden );
+ mVersionPopup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT );
- mVersionPopup.MarkDirtyForRelayout();
+ mVersionPopup.OutsideTouchedSignal().Connect( this, &DaliTableView::HideVersionPopup );
+ Stage::GetCurrent().Add( mVersionPopup );
}
- mVersionPopup.Show();
- mVersionPopupShown = true;
+ mVersionPopup.SetDisplayState( Popup::SHOWN );
}
}
void DaliTableView::HideVersionPopup()
{
- if ( mVersionPopup )
- {
- mVersionPopup.Hide();
- }
-}
-
-void DaliTableView::PopupHidden()
-{
- if ( mVersionPopup )
+ // Only hide if currently fully shown. If transitioning-in, the transition will not be interrupted.
+ if ( mVersionPopup && ( mVersionPopup.GetDisplayState() == Toolkit::Popup::SHOWN ) )
{
- mVersionPopupShown = false;
+ mVersionPopup.SetDisplayState( Popup::HIDDEN );
}
}