-#ifndef __DALI_DEMO_H__
-#define __DALI_DEMO_H__
+#ifndef DALI_DEMO_H
+#define DALI_DEMO_H
/*
- * 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.
*
*/
-#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;
typedef AnimationList::const_iterator AnimationListConstIter;
-
/**
* Example information
*
void AddExample(Example example);
/**
- * Sets the background image PATH.
- *
- * @param[in] imagePath The file path to the image to use as the background.
- *
- * @note Should be called before the Application MainLoop is started.
- */
- void SetBackgroundPath( std::string imagePath );
-
- /**
* Sorts the example list alphabetically by Title if parameter is true.
*
* @param[in] sortAlphabetically If true, example list is sorted alphabetically.
private: // Application callbacks & implementation
+ static const unsigned int FOCUS_ANIMATION_ACTOR_NUMBER = 2; ///< The number of elements used to form the custom focus effect
+
/**
* Shape enum for create function
*/
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::Size& parentSize, 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
+ *
+ * @param[in] actor The Actor representing this tile.
+ * @param[in] event The Touch information.
*
- * @return The stencil image
+ * @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
*
* @param[in] position The current position of the scroll contents.
*/
- void OnScrollStart(const Dali::Vector3& position);
+ void OnScrollStart(const Dali::Vector2& position);
/**
* Signal emitted when scrolling has completed.
*
* @param[in] position The current position of the scroll contents.
*/
- void OnScrollComplete(const Dali::Vector3& position);
+ void OnScrollComplete(const Dali::Vector2& position);
/**
* Signal emitted when any Sensitive Actor has been touched
* (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
/**
* Apply the cube effect to all the page actors
*/
- void ApplyCubeEffectToActors();
+ void ApplyCubeEffectToPages();
/**
* Setup the inner cube effect
void SetupInnerPageCubeEffect();
/**
- * Apply the cube effect to an actor
- */
- void ApplyCubeEffectToActor( Dali::Actor actor );
-
- /**
* Apply a shader effect to a table tile
*/
void ApplyEffectToTile(Dali::Actor tile);
* Create a depth field background
*
* @param[in] bubbleLayer Add the graphics to this layer
- * @param[in] backgroundLayer Add the background to this layer
*/
- void SetupBackground( Dali::Actor bubbleLayer, Dali::Actor backgroundLayer, const Dali::Vector2& size );
+ void SetupBackground( Dali::Actor bubbleLayer );
/**
* Create background actors for the given layer
*
* @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] size The size of the actor
+ * @param[in] distanceField A array (pointer) to 2 distance field types to use
*/
- void AddBackgroundActors( Dali::Actor layer, int count, Dali::BufferImage distanceField, const Dali::Vector2& size );
+ 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.
*
* @return The created image actor
*/
- Dali::ImageActor CreateLogo( std::string imagePath );
+ Dali::Toolkit::ImageView CreateLogo( std::string imagePath );
/**
* Timer handler for ending background animation
void PlayAnimation();
/**
+ * @brief Creates and sets up the custom effect used for the keyboard (and mouse) focus.
+ */
+ void CreateFocusEffect();
+
+ /**
* Callback when the keyboard focus is going to be changed.
*
* @param[in] current The current focused actor
* @param[in] direction The direction to move the focus
* @return The actor to move the keyboard focus to.
*/
- Dali::Actor OnKeyboardPreFocusChange( Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction );
+ Dali::Actor OnKeyboardPreFocusChange( Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocus::Direction direction );
/**
* Callback when the keyboard focused actor is activated.
*/
void HideVersionPopup();
- /**
- * Called when the popup is completely hidden
- */
- void PopupHidden();
+ /*
+ * @brief Callback called when the buttons page actor is relaid out
+ *
+ * @param[in] actor The page actor
+ */
+ void OnButtonsPageRelayout( const Dali::Actor& actor );
+
+ /**
+ * @brief The is connected to the keyboard focus highlight actor, and called when it is placed on stage.
+ * @param[in] actor The actor that has been placed on stage.
+ */
+ void OnStageConnect( Dali::Actor actor );
+
+ /**
+ * @brief Callback called to set up background actors
+ *
+ * @param[in] actor The actor raising the callback
+ */
+ void InitialiseBackgroundActors( Dali::Actor actor );
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::ImageActor mBackground; ///< Background's static image.
- Dali::ImageActor mLogo; ///< Logo's static image.
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
- Dali::ActorContainer mPages; ///< List of pages.
- Dali::ActorContainer mTableViewImages; ///< Offscreen render of tableview
- Dali::ActorContainer mBackgroundActors; ///< List of background actors used in the effect
+ /**
+ * This struct encapsulates all data relevant to each of the elements used within the custom keyboard focus effect.
+ */
+ struct FocusEffect
+ {
+ Dali::Toolkit::ImageView actor; ///< The parent keyboard focus highlight actor
+ Dali::Animation animation; ///< The animation for the parent keyboard focus highlight actor
+ };
+ FocusEffect mFocusEffect[FOCUS_ANIMATION_ACTOR_NUMBER]; ///< The elements used to create the custom focus effect
+
+ std::vector< Dali::Actor > mPages; ///< List of pages.
AnimationList mBackgroundAnimations; ///< List of background bubble animations
ExampleList mExampleList; ///< List of examples.
- ExampleMap mExampleMap; ///< Map LUT for examples.
- std::string mBackgroundImagePath; ///< The path to the background image.
+ 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
bool mSortAlphabetically:1; ///< Sort examples alphabetically.
bool mBackgroundAnimsPlaying:1; ///< Are background animations playing
- bool mVersionPopupShown:1; ///< Whehter the version popup is shown or not
+
};
-#endif // __DALI_DEMO_H__
+#endif // DALI_DEMO_H