#define __DALI_DEMO_H__
/*
- * 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 <map>
-
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
class Example;
typedef std::vector<Example> ExampleList;
-typedef std::map<std::string,Example> ExampleMap;
typedef ExampleList::iterator ExampleListIter;
typedef ExampleList::const_iterator ExampleListConstIter;
-typedef ExampleMap::iterator ExampleMapIter;
-typedef ExampleMap::const_iterator ExampleMapConstIter;
-
-typedef std::vector<Dali::Toolkit::TableView> TableViewList;
-typedef TableViewList::iterator TableViewListIter;
-typedef TableViewList::const_iterator TableViewListConstIter;
-
-typedef std::vector<Dali::ImageActor> ImageActorList;
-typedef ImageActorList::iterator ImageActorListIter;
-typedef ImageActorList::const_iterator ImageActorListConstIter;
typedef std::vector<Dali::Animation> AnimationList;
typedef AnimationList::iterator AnimationListIter;
enum ShapeType
{
CIRCLE,
- SQUARE
+ BUBBLE
};
/**
void Rotate( unsigned int degrees );
/**
- * Creates a tile for the main menu and toolbar.
+ * Creates a tile for the main menu.
*
* @param[in] name The unique name for this Tile
* @param[in] title The text caption that appears on the Tile
* @param[in] parentSize Tile's parent size.
- * @param[in] addBackground Whether to add a background graphic to the tile or not
+ * @param[in] position The tiles relative position within a page
*
* @return The Actor for the created tile.
*/
- Dali::Actor CreateTile( const std::string& name, const std::string& title, const Dali::Vector3& sizeMultiplier, bool addBackground );
+ Dali::Actor CreateTile( const std::string& name, const std::string& title, const Dali::Vector3& sizeMultiplier, Dali::Vector2& position );
+
+ // Signal handlers
/**
- * Create a stencil image
+ * Signal emitted when any tile has been pressed
*
- * @return The stencil image
+ * @param[in] actor The Actor representing this tile.
+ * @param[in] event The Touch information.
+ *
+ * @return Consume flag
*/
- Dali::ImageActor NewStencilImage();
-
- // Signal handlers
+ bool OnTilePressed( Dali::Actor actor, const Dali::TouchData& event );
/**
- * Signal emitted when any tile has been pressed
+ * Called by OnTilePressed & Accessibility to do the appropriate action.
*
* @param[in] actor The Actor representing this tile.
- * @param[in] event The TouchEvent
+ * @param[in] state The Touch state
*
* @return Consume flag
*/
- bool OnTilePressed( Dali::Actor actor, const Dali::TouchEvent& event );
+ bool DoTilePress( Dali::Actor actor, Dali::PointState::Type state );
/**
* Signal emitted when any tile has been hovered
* (other than those touches consumed by OnTilePressed)
*
* @param[in] actor The Actor touched.
- * @param[in] event The TouchEvent
+ * @param[in] event The Touch information.
*
* @return Consume flag
*/
- bool OnScrollTouched( Dali::Actor actor, const Dali::TouchEvent& event );
+ bool OnScrollTouched( Dali::Actor actor, const Dali::TouchData& event );
/**
* Setup the effect on the scroll view
*
* @param[in] layer The layer to add the actors to
* @param[in] count The number of actors to generate
- * @param[in] distanceField The distance field bitmap to use
+ * @param[in] distanceField A array (pointer) to 2 distance field types to use
*/
- void AddBackgroundActors( Dali::Actor layer, int count, Dali::BufferImage distanceField );
+ void AddBackgroundActors( Dali::Actor layer, int count, Dali::BufferImage* distanceField );
/**
* Create a bitmap with the specified shape and also output a distance field
* @param[in] size The size of the bitmap to create
* @param[out] imageOut The return bitmap
* @param[out] distanceFieldOut The return depth field alpha map
+ * @param[in] hollow Optional - Set to true for a thick circle outline without fill
*/
- void GenerateCircle( const Dali::Size& size, std::vector<unsigned char>& distanceFieldOut );
+ void GenerateCircle( const Dali::Size& size, std::vector<unsigned char>& distanceFieldOut, bool hollow = false );
/**
* Creates the logo.
private:
Dali::Application& mApplication; ///< Application instance.
- Dali::Layer mBackgroundLayer; ///< Background resides on a separate layer.
- Dali::Toolkit::TableView mRootActor; ///< All content (excluding background is anchored to this Actor)
+ Dali::Toolkit::Control mRootActor; ///< All content (excluding background is anchored to this Actor)
Dali::Animation mRotateAnimation; ///< Animation to rotate and resize mRootActor.
Dali::Animation mPressedAnimation; ///< Button press scaling animation.
- Dali::Layer mScrollViewLayer; ///< ScrollView resides on a separate layer.
Dali::Toolkit::ScrollView mScrollView; ///< ScrollView container (for all Examples)
Dali::Toolkit::ScrollViewEffect mScrollViewEffect; ///< Effect to be applied to the scroll view
Dali::Toolkit::RulerPtr mScrollRulerX; ///< ScrollView X (horizontal) ruler
Dali::Toolkit::RulerPtr mScrollRulerY; ///< ScrollView Y (vertical) ruler
- Dali::Toolkit::TableView mButtons; ///< Navigation buttons
Dali::Actor mPressedActor; ///< The currently pressed actor.
Dali::Timer mAnimationTimer; ///< Timer used to turn off animation after a specific time period
Dali::TapGestureDetector mLogoTapDetector; ///< To detect taps on the logo
Dali::Toolkit::Popup mVersionPopup; ///< Displays DALi library version information
- Dali::Vector3 mButtonsPageRelativeSize; ///< Size of a buttons page relative to the stage size
std::vector< Dali::Actor > mPages; ///< List of pages.
- std::vector< Dali::Actor > mTableViewImages; ///< Offscreen render of tableview
- std::vector< Dali::Actor > mBackgroundActors; ///< List of background actors used in the effect
AnimationList mBackgroundAnimations; ///< List of background bubble animations
ExampleList mExampleList; ///< List of examples.
- ExampleMap mExampleMap; ///< Map LUT for examples.
+ float mPageWidth; ///< The width of a page within the scroll-view, used to calculate the domain
int mTotalPages; ///< Total pages within scrollview.
bool mScrolling:1; ///< Flag indicating whether view is currently being scrolled