-#ifndef __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__
-#define __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__
+#ifndef DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H
+#define DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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 <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/object/property-notification.h>
-#include <dali/devel-api/common/map-wrapper.h>
#include <dali/public-api/object/property-map.h>
#include <dali/public-api/object/property-array.h>
virtual void OnChildAdd(Actor& child);
/**
- * From CustomActorImpl; called after a wheel-event is received by the owning actor.
+ * Called after a wheel-event is received by the owning actor.
+ * @param[in] actor Actor associated with the wheel event.
* @param[in] event The wheel event.
* @return True if the event should be consumed.
*/
- virtual bool OnWheelEvent(const WheelEvent& event);
+ bool OnWheelEvent(Actor actor, const WheelEvent& event);
private: // From Control
* @param[in] touch The touch information.
* @return True if the event should be consumed.
*/
- bool OnTouch( Actor actor, const TouchData& touch );
+ bool OnTouch( Actor actor, const TouchEvent& touch );
/**
* Called upon pan gesture event.
private:
- typedef std::map<unsigned int, Actor> ItemPool;
- typedef ItemPool::iterator ItemPoolIter;
- typedef ItemPool::const_iterator ConstItemPoolIter;
-
Property::Array mlayoutArray;
- ItemPool mItemPool;
+ ItemContainer mItemPool;
ItemFactory& mItemFactory;
std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects
Actor mOvershootOverlay; ///< The overlay actor for overshoot effect
float mScrollSpeed;
float mScrollOvershoot;
- Dali::Gesture::State mGestureState : 3;
+ GestureState mGestureState : 8;
bool mAnimatingOvershootOn : 1; ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off)
bool mAnimateOvershootOff : 1; ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off)
bool mAnchoringEnabled : 1;
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__
+#endif // DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H