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
Property refactor in dali-core: Toolkit changes for compiling
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
item-view
/
item-layout.cpp
diff --git
a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
index
2f733e5
..
33acbc4
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
+++ b/
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
@@
-200,10
+200,10
@@
void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
if (GetPositionConstraint(itemId, positionConstraint))
{
WrappedVector3Constraint wrapped(positionConstraint, itemId);
if (GetPositionConstraint(itemId, positionConstraint))
{
WrappedVector3Constraint wrapped(positionConstraint, itemId);
- Constraint constraint = Constraint::New<Vector3>( Actor::P
OSITION
,
+ Constraint constraint = Constraint::New<Vector3>( Actor::P
roperty::Position
,
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
- ParentSource( Actor::
SIZE
),
+ ParentSource( Actor::
Property::Size
),
wrapped );
constraint.SetApplyTime(durationSeconds);
constraint.SetAlphaFunction(mAlphaFunction);
wrapped );
constraint.SetApplyTime(durationSeconds);
constraint.SetAlphaFunction(mAlphaFunction);
@@
-215,10
+215,10
@@
void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
{
WrappedQuaternionConstraint wrapped(rotationConstraint, itemId);
{
WrappedQuaternionConstraint wrapped(rotationConstraint, itemId);
- Constraint constraint = Constraint::New<Quaternion>( Actor::
ROTATION
,
+ Constraint constraint = Constraint::New<Quaternion>( Actor::
Property::Rotation
,
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
- ParentSource( Actor::
SIZE
),
+ ParentSource( Actor::
Property::Size
),
wrapped );
constraint.SetApplyTime(durationSeconds);
constraint.SetAlphaFunction(mAlphaFunction);
wrapped );
constraint.SetApplyTime(durationSeconds);
constraint.SetAlphaFunction(mAlphaFunction);
@@
-231,10
+231,10
@@
void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
{
WrappedVector3Constraint wrapped(scaleConstraint, itemId);
{
WrappedVector3Constraint wrapped(scaleConstraint, itemId);
- Constraint constraint = Constraint::New<Vector3>( Actor::
SCALE
,
+ Constraint constraint = Constraint::New<Vector3>( Actor::
Property::Scale
,
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
- ParentSource( Actor::
SIZE
),
+ ParentSource( Actor::
Property::Size
),
wrapped );
constraint.SetApplyTime(durationSeconds);
constraint.SetAlphaFunction(mAlphaFunction);
wrapped );
constraint.SetApplyTime(durationSeconds);
constraint.SetAlphaFunction(mAlphaFunction);
@@
-247,10
+247,10
@@
void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
{
WrappedVector4Constraint wrapped(colorConstraint, itemId);
{
WrappedVector4Constraint wrapped(colorConstraint, itemId);
- Constraint constraint = Constraint::New<Vector4>( Actor::
COLOR
,
+ Constraint constraint = Constraint::New<Vector4>( Actor::
Property::Color
,
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
- ParentSource( Actor::
SIZE
),
+ ParentSource( Actor::
Property::Size
),
wrapped );
constraint.SetApplyTime(durationSeconds);
wrapped );
constraint.SetApplyTime(durationSeconds);
@@
-265,10
+265,10
@@
void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d
{
WrappedBoolConstraint wrapped(visibilityConstraint, itemId);
{
WrappedBoolConstraint wrapped(visibilityConstraint, itemId);
- Constraint constraint = Constraint::New<bool>( Actor::
VISIBLE
,
+ Constraint constraint = Constraint::New<bool>( Actor::
Property::Visible
,
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
Source( scrollPositionObject, scrollPositionProperty ),
ParentSource( scrollSpeedProperty ),
- ParentSource( Actor::
SIZE
),
+ ParentSource( Actor::
Property::Size
),
wrapped );
constraint.SetApplyTime(durationSeconds);
wrapped );
constraint.SetApplyTime(durationSeconds);