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
Added PropertyValue Array as a class
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-base-impl.h
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
index
a4b955c
..
dcc5f74
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
@@
-21,7
+21,6
@@
// EXTERNAL INCLUDES
// TODO - Replace list with dali-vector.h
#include <list>
// EXTERNAL INCLUDES
// TODO - Replace list with dali-vector.h
#include <list>
-#include <dali/public-api/animation/active-constraint.h>
#include <dali/public-api/animation/constraint.h>
// INTERNAL INCLUDES
#include <dali/public-api/animation/constraint.h>
// INTERNAL INCLUDES
@@
-79,8
+78,9
@@
public:
*/
void ApplyConstraint(Constraint constraint)
{
*/
void ApplyConstraint(Constraint constraint)
{
- ActiveConstraint activeConstraint = mActor.ApplyConstraint( constraint );
- mConstraints.push_back( activeConstraint );
+ Constraint clone = constraint.Clone( mActor );
+ clone.Apply();
+ mConstraints.push_back( clone );
}
/**
}
/**
@@
-90,17
+90,17
@@
public:
*/
void RemoveConstraints()
{
*/
void RemoveConstraints()
{
- std::vector<
Active
Constraint>::iterator it = mConstraints.begin();
- std::vector<
Active
Constraint>::iterator end = mConstraints.end();
+ std::vector<Constraint>::iterator it = mConstraints.begin();
+ std::vector<Constraint>::iterator end = mConstraints.end();
for(;it!=end;++it)
{
for(;it!=end;++it)
{
-
mActor.RemoveConstraint(*it
);
+
it->Remove(
);
}
mConstraints.clear();
}
Actor mActor; ///< The Actor that this ActorInfo represents.
}
mConstraints.clear();
}
Actor mActor; ///< The Actor that this ActorInfo represents.
- std::vector<
Active
Constraint> mConstraints; ///< A list keeping track of constraints applied to the actor via this delegate.
+ std::vector<Constraint> mConstraints; ///< A list keeping track of constraints applied to the actor via this delegate.
};
typedef IntrusivePtr<ActorInfo> ActorInfoPtr;
};
typedef IntrusivePtr<ActorInfo> ActorInfoPtr;
@@
-191,6
+191,13
@@
protected:
*/
ScrollBase();
*/
ScrollBase();
+ /**
+ * @brief Construct a new ScrollBase.
+ *
+ * @param[in] behaviourFlags Flags to enable
+ */
+ ScrollBase( ControlBehaviour behaviourFlags );
+
protected:
ScrollBase *mParent; ///< Pointer to ScrollBase parent, if exists.
protected:
ScrollBase *mParent; ///< Pointer to ScrollBase parent, if exists.