projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates after Handle/Constrainable merge
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scroll-view
/
scroll-view.h
diff --git
a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
index
b357900
..
8287d53
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
+++ b/
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
@@
-18,6
+18,9
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/alpha-functions.h>
+
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
@@
-376,6
+379,11
@@
class ScrollView;
/**
* @brief ScrollView contains actors that can be scrolled manually (via touch)
* or automatically.
/**
* @brief ScrollView contains actors that can be scrolled manually (via touch)
* or automatically.
+ *
+ * Signals
+ * | %Signal Name | Method |
+ * |-------------------|----------------------------|
+ * | snap-started | @ref SnapStartedSignal() |
*/
class DALI_IMPORT_API ScrollView : public Scrollable
{
*/
class DALI_IMPORT_API ScrollView : public Scrollable
{
@@
-409,9
+417,6
@@
public:
static const float DEFAULT_FLICK_SPEED_COEFFICIENT; ///< Default Flick speed coefficient (multiples input touch velocity)
static const float DEFAULT_MAX_FLICK_SPEED; ///< Default Maximum flick speed. (in stage diagonals per second)
static const float DEFAULT_FLICK_SPEED_COEFFICIENT; ///< Default Flick speed coefficient (multiples input touch velocity)
static const float DEFAULT_MAX_FLICK_SPEED; ///< Default Maximum flick speed. (in stage diagonals per second)
- //Signal Names
- static const char* const SIGNAL_SNAP_STARTED; ///< Name "snap-started"
-
/// Direction of transitions
enum EDirectionFlag
{
/// Direction of transitions
enum EDirectionFlag
{