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
(ScrollView) Inlined one line Getters/Setters
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-impl.h
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index
c53e3b7
..
4d871a7
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@
-104,42
+104,66
@@
public:
/**
* @copydoc Toolkit::ScrollView::GetScrollSnapAlphaFunction
*/
/**
* @copydoc Toolkit::ScrollView::GetScrollSnapAlphaFunction
*/
- AlphaFunction GetScrollSnapAlphaFunction() const;
+ AlphaFunction GetScrollSnapAlphaFunction() const
+ {
+ return mSnapAlphaFunction;
+ }
/**
* @copydoc Toolkit::ScrollView::SetScrollSnapAlphaFunction
*/
/**
* @copydoc Toolkit::ScrollView::SetScrollSnapAlphaFunction
*/
- void SetScrollSnapAlphaFunction(AlphaFunction alpha);
+ void SetScrollSnapAlphaFunction(AlphaFunction alpha)
+ {
+ mSnapAlphaFunction = alpha;
+ }
/**
* @copydoc Toolkit::ScrollView::GetScrollFlickAlphaFunction
*/
/**
* @copydoc Toolkit::ScrollView::GetScrollFlickAlphaFunction
*/
- AlphaFunction GetScrollFlickAlphaFunction() const;
+ AlphaFunction GetScrollFlickAlphaFunction() const
+ {
+ return mFlickAlphaFunction;
+ }
/**
* @copydoc Toolkit::ScrollView::SetScrollFlickAlphaFunction
*/
/**
* @copydoc Toolkit::ScrollView::SetScrollFlickAlphaFunction
*/
- void SetScrollFlickAlphaFunction(AlphaFunction alpha);
+ void SetScrollFlickAlphaFunction(AlphaFunction alpha)
+ {
+ mFlickAlphaFunction = alpha;
+ }
/**
* @copydoc Toolkit::ScrollView::GetScrollSnapDuration
*/
/**
* @copydoc Toolkit::ScrollView::GetScrollSnapDuration
*/
- float GetScrollSnapDuration() const;
+ float GetScrollSnapDuration() const
+ {
+ return mSnapDuration;
+ }
/**
* @copydoc Toolkit::ScrollView::SetScrollSnapDuration
*/
/**
* @copydoc Toolkit::ScrollView::SetScrollSnapDuration
*/
- void SetScrollSnapDuration(float time);
+ void SetScrollSnapDuration(float time)
+ {
+ mSnapDuration = time;
+ }
/**
* @copydoc Toolkit::ScrollView::GetScrollFlickDuration
*/
/**
* @copydoc Toolkit::ScrollView::GetScrollFlickDuration
*/
- float GetScrollFlickDuration() const;
+ float GetScrollFlickDuration() const
+ {
+ return mFlickDuration;
+ }
/**
* @copydoc Toolkit::ScrollView::SetScrollFlickDuration
*/
/**
* @copydoc Toolkit::ScrollView::SetScrollFlickDuration
*/
- void SetScrollFlickDuration(float time);
+ void SetScrollFlickDuration(float time)
+ {
+ mFlickDuration = time;
+ }
/**
* @copydoc Toolkit::ScrollView::ApplyEffect
/**
* @copydoc Toolkit::ScrollView::ApplyEffect
@@
-169,12
+193,18
@@
public:
/**
* @copydoc Toolkit::ScrollView::GetRulerX
*/
/**
* @copydoc Toolkit::ScrollView::GetRulerX
*/
- const RulerPtr GetRulerX() const;
+ const RulerPtr GetRulerX() const
+ {
+ return mRulerX;
+ }
/**
* @copydoc Toolkit::ScrollView::GetRulerY
*/
/**
* @copydoc Toolkit::ScrollView::GetRulerY
*/
- const RulerPtr GetRulerY() const;
+ const RulerPtr GetRulerY() const
+ {
+ return mRulerY;
+ }
/**
* @copydoc Toolkit::ScrollView::SetRulerX
/**
* @copydoc Toolkit::ScrollView::SetRulerX
@@
-191,7
+221,10
@@
public:
*
* @return whether the touch sensitivity is true or false.
*/
*
* @return whether the touch sensitivity is true or false.
*/
- bool GetScrollSensitive();
+ bool GetScrollSensitive()
+ {
+ return mSensitive;
+ }
/**
* @copydoc Toolkit::ScrollView::SetScrollSensitive
/**
* @copydoc Toolkit::ScrollView::SetScrollSensitive
@@
-206,19
+239,28
@@
public:
/**
* @copydoc Toolkit::ScrollView::SetSnapOvershootAlphaFunction
*/
/**
* @copydoc Toolkit::ScrollView::SetSnapOvershootAlphaFunction
*/
- void SetSnapOvershootAlphaFunction(AlphaFunction alpha);
+ void SetSnapOvershootAlphaFunction(AlphaFunction alpha)
+ {
+ mSnapOvershootAlphaFunction = alpha;
+ }
/**
* Retrieve the duartion of Snap Overshoot animation
*
* @return the duration.
*/
/**
* Retrieve the duartion of Snap Overshoot animation
*
* @return the duration.
*/
- float GetSnapOvershootDuration();
+ float GetSnapOvershootDuration()
+ {
+ return mSnapOvershootDuration;
+ }
/**
* @copydoc Toolkit::ScrollView::SetSnapOvershootDuration
*/
/**
* @copydoc Toolkit::ScrollView::SetSnapOvershootDuration
*/
- void SetSnapOvershootDuration(float duration);
+ void SetSnapOvershootDuration(float duration)
+ {
+ mSnapOvershootDuration = duration;
+ }
/**
* Retrieve whether Actor Auto-Snap mode is enabled or not.
/**
* Retrieve whether Actor Auto-Snap mode is enabled or not.
@@
-230,7
+272,10
@@
public:
/**
* @copydoc Toolkit::ScrollView::SetActorAutoSnap
*/
/**
* @copydoc Toolkit::ScrollView::SetActorAutoSnap
*/
- void SetActorAutoSnap(bool enable);
+ void SetActorAutoSnap(bool enable)
+ {
+ mActorAutoSnapEnabled = enable;
+ }
/**
* Enables or Disables Auto Resizing mode for ScrollView contents.
/**
* Enables or Disables Auto Resizing mode for ScrollView contents.
@@
-252,7
+297,10
@@
public:
*
* @return Wrap Mode Enabled flag.
*/
*
* @return Wrap Mode Enabled flag.
*/
- bool GetWrapMode() const;
+ bool GetWrapMode() const
+ {
+ return mWrapMode;
+ }
/**
* @copydoc Toolkit::ScrollView::SetWrapMode
/**
* @copydoc Toolkit::ScrollView::SetWrapMode
@@
-262,17
+310,26
@@
public:
/**
* @copydoc Toolkit::ScrollView::GetScrollupdateDistance
*/
/**
* @copydoc Toolkit::ScrollView::GetScrollupdateDistance
*/
- int GetScrollUpdateDistance() const;
+ int GetScrollUpdateDistance() const
+ {
+ return mScrollUpdateDistance;
+ }
/**
* @copydoc Toolkit::ScrollView::SetScrollUpdateDistance
*/
/**
* @copydoc Toolkit::ScrollView::SetScrollUpdateDistance
*/
- void SetScrollUpdateDistance(int distance);
+ void SetScrollUpdateDistance(int distance)
+ {
+ mScrollUpdateDistance = distance;
+ }
/**
* @copydoc Toolkit::ScrollView::GetAxisAutoLock
*/
/**
* @copydoc Toolkit::ScrollView::GetAxisAutoLock
*/
- bool GetAxisAutoLock() const;
+ bool GetAxisAutoLock() const
+ {
+ return mAxisAutoLock;
+ }
/**
* @copydoc Toolkit::ScrollView::SetAxisAutoLock
/**
* @copydoc Toolkit::ScrollView::SetAxisAutoLock
@@
-282,7
+339,10
@@
public:
/**
* @copydoc Toolkit::ScrollView::GetAxisAutoLockGradient
*/
/**
* @copydoc Toolkit::ScrollView::GetAxisAutoLockGradient
*/
- float GetAxisAutoLockGradient() const;
+ float GetAxisAutoLockGradient() const
+ {
+ return mAxisAutoLockGradient;
+ }
/**
* @copydoc Toolkit::ScrollView::SetAxisAutoLockGradient
/**
* @copydoc Toolkit::ScrollView::SetAxisAutoLockGradient
@@
-292,7
+352,10
@@
public:
/**
* @copydoc Toolkit::ScrollView::GetFrictionCoefficient
*/
/**
* @copydoc Toolkit::ScrollView::GetFrictionCoefficient
*/
- float GetFrictionCoefficient() const;
+ float GetFrictionCoefficient() const
+ {
+ return mFrictionCoefficient;
+ }
/**
* @copydoc Toolkit::ScrollView::SetFrictionCoefficient
/**
* @copydoc Toolkit::ScrollView::SetFrictionCoefficient
@@
-302,52
+365,82
@@
public:
/**
* @copydoc Toolkit::ScrollView::GetFlickSpeedCoefficient
*/
/**
* @copydoc Toolkit::ScrollView::GetFlickSpeedCoefficient
*/
- float GetFlickSpeedCoefficient() const;
+ float GetFlickSpeedCoefficient() const
+ {
+ return mFlickSpeedCoefficient;
+ }
/**
* @copydoc Toolkit::ScrollView::SetFlickSpeedCoefficient
*/
/**
* @copydoc Toolkit::ScrollView::SetFlickSpeedCoefficient
*/
- void SetFlickSpeedCoefficient(float speed);
+ void SetFlickSpeedCoefficient(float speed)
+ {
+ mFlickSpeedCoefficient = speed;
+ }
/**
* @copydoc Toolkit::ScrollView::GetMinimumDistanceForFlick
*/
/**
* @copydoc Toolkit::ScrollView::GetMinimumDistanceForFlick
*/
- Vector2 GetMinimumDistanceForFlick() const;
+ Vector2 GetMinimumDistanceForFlick() const
+ {
+ return mMinFlickDistance;
+ }
/**
* @copydoc Toolkit::ScrollView::SetMinimumDistanceForFlick
*/
/**
* @copydoc Toolkit::ScrollView::SetMinimumDistanceForFlick
*/
- void SetMinimumDistanceForFlick(const Vector2& distance);
+ void SetMinimumDistanceForFlick(const Vector2& distance)
+ {
+ mMinFlickDistance = distance;
+ }
/**
* @copydoc Toolkit::ScrollView::GetMinimumSpeedForFlick
*/
/**
* @copydoc Toolkit::ScrollView::GetMinimumSpeedForFlick
*/
- float GetMinimumSpeedForFlick() const;
+ float GetMinimumSpeedForFlick() const
+ {
+ return mFlickSpeedThreshold;
+ }
/**
* @copydoc Toolkit::ScrollView::SetMinimumSpeedForFlick
*/
/**
* @copydoc Toolkit::ScrollView::SetMinimumSpeedForFlick
*/
- void SetMinimumSpeedForFlick(float speed);
+ void SetMinimumSpeedForFlick(float speed)
+ {
+ mFlickSpeedThreshold = speed;
+ }
/**
* @copydoc Toolkit::ScrollView::GetMaxFlickSpeed
*/
/**
* @copydoc Toolkit::ScrollView::GetMaxFlickSpeed
*/
- float GetMaxFlickSpeed() const;
+ float GetMaxFlickSpeed() const
+ {
+ return mMaxFlickSpeed;
+ }
/**
* @copydoc Toolkit::ScrollView::SetMaxFlickSpeed
*/
/**
* @copydoc Toolkit::ScrollView::SetMaxFlickSpeed
*/
- void SetMaxFlickSpeed(float speed);
+ void SetMaxFlickSpeed(float speed)
+ {
+ mMaxFlickSpeed = speed;
+ }
/**
* @copydoc Toolkit::ScrollView::GetWheelScrollDistanceStep
*/
/**
* @copydoc Toolkit::ScrollView::GetWheelScrollDistanceStep
*/
- Vector2 GetWheelScrollDistanceStep() const;
+ Vector2 GetWheelScrollDistanceStep() const
+ {
+ return mWheelScrollDistanceStep;
+ }
/**
* @copydoc Toolkit::ScrollView::SetWheelScrollDistanceStep
*/
/**
* @copydoc Toolkit::ScrollView::SetWheelScrollDistanceStep
*/
- void SetWheelScrollDistanceStep(Vector2 step);
+ void SetWheelScrollDistanceStep(Vector2 step)
+ {
+ mWheelScrollDistanceStep = step;
+ }
/**
* @copydoc Toolkit::ScrollView::GetCurrentPage
/**
* @copydoc Toolkit::ScrollView::GetCurrentPage