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
Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
1697c9b
..
b88b3d7
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-231,7
+231,7
@@
void SetupBackgroundActor( Actor actor, Property::Index constrainingIndex, const
actor.SetZ( BACKGROUND_ACTOR_Z_POSITION );
Constraint constraint = Constraint::New<Vector3>( constrainingIndex,
actor.SetZ( BACKGROUND_ACTOR_Z_POSITION );
Constraint constraint = Constraint::New<Vector3>( constrainingIndex,
- ParentSource( Actor::
SIZE
),
+ ParentSource( Actor::
Property::Size
),
EqualToConstraint() );
actor.ApplyConstraint( constraint );
}
EqualToConstraint() );
actor.ApplyConstraint( constraint );
}
@@
-788,8
+788,7
@@
void Control::SetBackgroundColor( const Vector4& color )
// Create Mesh Actor
MeshActor meshActor = MeshActor::New( CreateMesh() );
// Create Mesh Actor
MeshActor meshActor = MeshActor::New( CreateMesh() );
- meshActor.SetAffectedByLighting( false );
- SetupBackgroundActor( meshActor, Actor::SCALE, color );
+ SetupBackgroundActor( meshActor, Actor::Property::Scale, color );
// Set the background actor before adding so that we do not inform deriving classes
background.actor = meshActor;
// Set the background actor before adding so that we do not inform deriving classes
background.actor = meshActor;
@@
-820,7
+819,7
@@
void Control::SetBackground( Image image )
}
ImageActor imageActor = ImageActor::New( image );
}
ImageActor imageActor = ImageActor::New( image );
- SetupBackgroundActor( imageActor, Actor::
SIZE
, background.color );
+ SetupBackgroundActor( imageActor, Actor::
Property::Size
, background.color );
// Set the background actor before adding so that we do not inform derived classes
background.actor = imageActor;
// Set the background actor before adding so that we do not inform derived classes
background.actor = imageActor;