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 Drop Shadow properties and initial effect with Text Atlas Renderer
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-signals.cpp
diff --git
a/dali-toolkit/internal/builder/builder-signals.cpp
b/dali-toolkit/internal/builder/builder-signals.cpp
index
40428e3
..
0efd85b
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-signals.cpp
+++ b/
dali-toolkit/internal/builder/builder-signals.cpp
@@
-43,12
+43,12
@@
using namespace Dali;
// Signal Actions
//
// Signal Actions
//
-// Action on child actor. The child is found by
alias so can be 'previous' etc.
+// Action on child actor. The child is found by
name
struct ChildActorAction
{
std::string actorName;
std::string actionName;
struct ChildActorAction
{
std::string actorName;
std::string actionName;
- std::string child
Alias
;
+ std::string child
Name
;
PropertyValueContainer parameters;
void operator()(void)
PropertyValueContainer parameters;
void operator()(void)
@@
-57,7
+57,7
@@
struct ChildActorAction
if(actor)
{
if(actor)
{
- Actor child_actor = actor.FindChildBy
Alias(childAlias
);
+ Actor child_actor = actor.FindChildBy
Name(childName
);
if(child_actor)
{
if(child_actor)
{
@@
-65,7
+65,7
@@
struct ChildActorAction
}
else
{
}
else
{
- DALI_SCRIPT_WARNING("Could not find child by
alias '%s'\n", childAlias
.c_str());
+ DALI_SCRIPT_WARNING("Could not find child by
name '%s'\n", childName
.c_str());
}
}
};
}
}
};
@@
-239,7
+239,7
@@
boost::function<void (void)> GetAction(const TreeNode &root, const TreeNode &chi
{
ChildActorAction action;
action.actorName = *actorName;
{
ChildActorAction action;
action.actorName = *actorName;
- action.child
Alias
= *childActorName;
+ action.child
Name
= *childActorName;
action.actionName = *actionName;
GetParameters(child, action.parameters);
callback = action;
action.actionName = *actionName;
GetParameters(child, action.parameters);
callback = action;