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
Use new animatable registered properties in ScrollView
[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
8f9abc7
..
da194f9
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
@@
-525,11
+525,6
@@
private: // private overriden functions from CustomActorImpl and Controls
virtual void OnChildRemove(Actor& child);
/**
virtual void OnChildRemove(Actor& child);
/**
- * @copydoc Dali::CustomActorImpl::OnPropertySet( Property::Index index, Property::Value propertyValue )
- */
- virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
-
- /**
* From CustomActorImpl; called after a touch-signal is received by the owning actor.
*
* We don't listen to these events as content within the contain may consume events.
* From CustomActorImpl; called after a touch-signal is received by the owning actor.
*
* We don't listen to these events as content within the contain may consume events.
@@
-591,7
+586,7
@@
private:
/**
* Called whenever a snap animation has completed
* @param[in] source the Animation instance that has completed.
/**
* Called whenever a snap animation has completed
* @param[in] source the Animation instance that has completed.
- * Resets all scrolling animations and states, leaving current scroll position at
mPropertyPosition
+ * Resets all scrolling animations and states, leaving current scroll position at
SCROLL_POSITION
*/
void ResetScrolling();
*/
void ResetScrolling();
@@
-636,7
+631,7
@@
private:
void OnScrollAnimationFinished( Animation& source );
/**
void OnScrollAnimationFinished( Animation& source );
/**
- * Called when either the X or Y internal scroll positions have finished snapping back to
mPropertyPrePosition
+ * Called when either the X or Y internal scroll positions have finished snapping back to
SCROLL_PRE_POSITION
*
* @param[in] source the Animation instance that has completed.
*/
*
* @param[in] source the Animation instance that has completed.
*/