static bool gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked.
static Vector3 gConstraintResult; ///< Result from constraint.
-static ActorContainer gPages; ///< Keeps track of all the pages for applying effects.
+static std::vector< Actor > gPages; ///< Keeps track of all the pages for applying effects.
+typedef std::vector< Actor >::iterator ActorIter;
static void ResetScrollCallbackResults()
{
void PushButton::ConfigureSizeNegotiation()
{
- ActorContainer images;
+ std::vector< Actor > images;
images.reserve( 7 );
images.push_back( GetButtonImage() );
}
}
-void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const ActorContainer& images, Actor& label )
+void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label )
{
ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT;
ResizePolicy::Type labelResizePolicy = ResizePolicy::FILL_TO_PARENT;
label.SetResizePolicy( labelResizePolicy, dimension );
}
- for( ActorConstIter it = images.begin(), itEnd = images.end(); it != itEnd; ++it )
+ for( std::vector< Actor >::const_iterator it = images.begin(), itEnd = images.end(); it != itEnd; ++it )
{
Actor actor = *it;
if( actor )
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
* @param[in] images The list of images to configure
* @param[in] label The text label to configure
*/
- void ConfigureSizeNegotiationDimension( Dimension::Type dimension, const ActorContainer& images, Actor& label );
+ void ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label );
// slots
mBackgroundImage.SetVisible( !( mButtons.empty() && mPopupLayout.GetChildCount() == 0 ) );
// Relayout All buttons
- if ( !mButtons.empty() )
+ if( !mButtons.empty() )
{
// All buttons should be the same size and fill the button area. The button spacing needs to be accounted for as well.
Vector2 buttonSize( ( ( size.width - mPopupStyle->buttonSpacing * ( mButtons.size() + 1 ) ) / mButtons.size() ),
Vector3 buttonPosition( mPopupStyle->buttonSpacing, 0.0f, 0.0f );
- for ( ActorIter iter = mButtons.begin(), endIter = mButtons.end();
+ for( std::vector< Actor >::iterator iter = mButtons.begin(), endIter = mButtons.end();
iter != endIter;
++iter, buttonPosition.x += mPopupStyle->buttonSpacing + buttonSize.width )
{
else
{
// Rebuild the focus chain because button or content can be added or removed dynamically
- ActorContainer focusableActors;
+ std::vector< Actor > focusableActors;
if( mContent && mContent.IsKeyboardFocusable() )
{
focusableActors.push_back(mContent);
}
}
- for ( ActorContainer::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter )
+ for( std::vector< Actor >::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter )
{
if ( currentFocusedActor == *iter )
{
Actor mBottomBg; ///< bottom button bar background. ImageActor is replaced with Actor due to hidden image.
Actor mTailImage; ///< Stores the tail image
- ActorContainer mButtons; ///< Keeps track of the buttons added to this popup.
+ std::vector< Actor > mButtons; ///< Keeps track of the buttons added to this popup.
Toolkit::Popup::PopupState mState; ///< Popup current state.
Animation mAnimation; ///< The animation instance managing state changing.
bool mAlterAddedChild; ///< Flag used to control whether children are reparented or not.
ItemPool mItemPool;
- ItemLayoutContainer mLayouts;
+ std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects
ItemLayout* mActiveLayout;
Vector3 mActiveLayoutTargetSize;
static const unsigned int SCROLL_ANIMATION_FLAGS = AnimatingInternalX | AnimatingInternalY;
static const unsigned int SNAP_ANIMATION_FLAGS = SnappingInternalX | SnappingInternalY;
+private:
+
+ typedef std::vector<Dali::Toolkit::ScrollViewEffect> ScrollViewEffectContainer; ///< Container of Dali::Toolkit::ScrollViewEffect
+ typedef ScrollViewEffectContainer::iterator ScrollViewEffectIter; ///< Iterator for Dali::Toolkit::ScrollViewEffectContainer
+
public:
/**
unsigned int mNumRows;
unsigned int mNumColumns;
Size mViewAreaSize;
- ActorContainer mBoxes;
+ std::vector< Actor > mBoxes;
std::vector< ImageActor > mTiles[2];
int mRotateIndex;
Size mTileSize;
* @param [in] child The child.
* @post The child will be referenced by its parent. This means that the child will be kept alive,
* even if the handle passed into this method is reset or destroyed.
- * @post This may invalidate ActorContainer iterators.
*/
void Add(Actor child);
* @pre This Actor (the parent) has been initialized.
* @pre The child actor is not the same as the parent actor.
* @param [in] child The child.
- * @post This may invalidate ActorContainer iterators.
*/
void Remove(Actor child);
// EXTERNAL INCLUDES
#include <dali/public-api/adaptor-framework/style-change.h>
-#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/events/long-press-gesture.h>
#include <dali/public-api/events/pan-gesture.h>
#include <dali/public-api/events/pinch-gesture.h>
* @param [in] child The child.
* @post The child will be referenced by its parent. This means that the child will be kept alive,
* even if the handle passed into this method is reset or destroyed.
- * @post This may invalidate ActorContainer iterators.
*/
void Add(Actor child);
* @pre This Actor (the parent) has been initialized.
* @pre The child actor is not the same as the parent actor.
* @param [in] child The child.
- * @post This may invalidate ActorContainer iterators.
*/
void Remove(Actor child);
// EXTERNAL INCLUDES
#include <boost/function.hpp>
#include <dali/public-api/animation/alpha-function.h>
-#include <dali/public-api/common/vector-wrapper.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/enums.h>
typedef IntrusivePtr<ItemLayout> ItemLayoutPtr; ///< Pointer to a Dali::Toolkit::ItemLayout object
-typedef std::vector<ItemLayoutPtr> ItemLayoutContainer; ///< Container of Dali::Toolkit::ItemLayout objects
-typedef ItemLayoutContainer::iterator ItemLayoutIter; ///< Iterator for Dali::Toolkit::ItemLayoutContainer
-typedef ItemLayoutContainer::const_iterator ItemLayoutConstIter; ///< Const Iterator for Dali::Toolkit::ItemLayoutContainer
-
-
/**
* @brief A support class for managing ranges of items.
*/
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/base-handle.h>
namespace Dali
class ScrollView;
class ScrollViewEffect;
-typedef std::vector<ScrollViewEffect> ScrollViewEffectContainer; ///< Container of Dali::Toolkit::ScrollViewEffect%s
-typedef ScrollViewEffectContainer::iterator ScrollViewEffectIter; ///< Iterator for Dali::Toolkit::ScrollViewEffectContainer
-typedef ScrollViewEffectContainer::const_iterator ScrollViewEffectConstIter; ///< Const Iterator for Dali::Toolkit::ScrollViewEffectContainer
-
/**
* @brief ScrollView Effect base class, used to apply custom effects to a
* ScrollView instance.
* @param [in] child The child.
* @post The child will be referenced by its parent. This means that the child will be kept alive,
* even if the handle passed into this method is reset or destroyed.
- * @post This may invalidate ActorContainer iterators.
*/
void Add(Actor child);
* @pre This Actor (the parent) has been initialized.
* @pre The child actor is not the same as the parent actor.
* @param [in] child The child.
- * @post This may invalidate ActorContainer iterators.
*/
void Remove(Actor child);