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
Cancelled signal is triggered to reset status when gesture is detached.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-connector-impl.h
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
index
7545fc5
..
a5603a9
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
@@
-36,9
+36,10
@@
class ScrollConnector : public Dali::BaseObject
{
public:
{
public:
- typedef Toolkit::ScrollConnector::
LimitsChangedSignalType Limits
ChangedSignalType;
+ typedef Toolkit::ScrollConnector::
DomainChangedSignalType Domain
ChangedSignalType;
static const Property::Index SCROLL_POSITION;
static const Property::Index SCROLL_POSITION;
+ static const Property::Index OVERSHOOT;
/**
* Create a ScrollConnector.
/**
* Create a ScrollConnector.
@@
-47,9
+48,9
@@
public:
static ScrollConnector* New();
/**
static ScrollConnector* New();
/**
- * @copydoc Toolkit::ScrollConnector::Set
Limits
()
+ * @copydoc Toolkit::ScrollConnector::Set
ScrollDomain
()
*/
*/
- void Set
Limits( float min, float max
);
+ void Set
ScrollDomain( float min, float max, float length
);
/**
* @copydoc Toolkit::ScrollConnector::GetMinLimit()
/**
* @copydoc Toolkit::ScrollConnector::GetMinLimit()
@@
-68,11
+69,19
@@
public:
}
/**
}
/**
- *
Signal emitted after the SetLimits() method has been called.
+ *
@copydoc Toolkit::ScrollConnector::GetContentLength()
*/
*/
- LimitsChangedSignalType& LimitsChangedSignal()
+ float GetContentLength() const
{
{
- return mLimitsChangedSignal;
+ return mContentLength;
+ }
+
+ /**
+ * Signal emitted after the SetScrollDomain() method has been called.
+ */
+ DomainChangedSignalType& DomainChangedSignal()
+ {
+ return mDomainChangedSignal;
}
/**
}
/**
@@
-106,10
+115,11
@@
private:
Constrainable mScrollPositionObject;
Constrainable mScrollPositionObject;
-
LimitsChangedSignalType mLimits
ChangedSignal;
+
DomainChangedSignalType mDomain
ChangedSignal;
float mMinLimit;
float mMaxLimit;
float mMinLimit;
float mMaxLimit;
+ float mContentLength;
};
} // namespace Internal
};
} // namespace Internal