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 "(Visual) Support CORNER_RADIUS_POLICY" into devel/master
[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
ed22ef3
..
d38e1d4
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-signals.cpp
+++ b/
dali-toolkit/internal/builder/builder-signals.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,6
+20,7
@@
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/type-info.h>
#include <dali/public-api/object/property-notification.h>
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/type-info.h>
#include <dali/public-api/object/property-notification.h>
+#include <dali/devel-api/common/stage.h>
#include <dali/integration-api/debug.h>
#include <limits>
#include <dali/integration-api/debug.h>
#include <limits>
@@
-35,7
+36,7
@@
namespace Toolkit
namespace Internal
{
extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder );
namespace Internal
{
extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder );
-extern
bool Set
PropertyFromNode( const TreeNode& node, Property::Value& value );
+extern
void Determine
PropertyFromNode( const TreeNode& node, Property::Value& value );
}
}
}
}
}
}
@@
-342,7
+343,7
@@
Property::Value GetPropertyValue(const TreeNode &child)
if(0 == nChildren)
{
// cast away unused return for static analyzers
if(0 == nChildren)
{
// cast away unused return for static analyzers
- static_cast<void>( Dali::Toolkit::Internal::
Set
PropertyFromNode( child, ret ) );
+ static_cast<void>( Dali::Toolkit::Internal::
Determine
PropertyFromNode( child, ret ) );
}
else if(1 == nChildren)
{
}
else if(1 == nChildren)
{
@@
-484,10
+485,7
@@
void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
action.actorName = *actorName;
action.propertyName = *propertyName;
// actor may not exist yet so we can't check the property type
action.actorName = *actorName;
action.propertyName = *propertyName;
// actor may not exist yet so we can't check the property type
- if( !Dali::Toolkit::Internal::SetPropertyFromNode( *valueChild, action.value ) )
- {
- DALI_SCRIPT_WARNING("Cannot set property for set property action\n");
- }
+ Dali::Toolkit::Internal::DeterminePropertyFromNode( *valueChild, action.value );
connector.Connect( action );
}
else
connector.Connect( action );
}
else
@@
-639,7
+637,7
@@
void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
{
// no named actor; presume self
GenericAction action;
{
// no named actor; presume self
GenericAction action;
- action.actorName = actor.Get
Name(
);
+ action.actorName = actor.Get
Property< std::string >( Dali::Actor::Property::NAME
);
action.actionName = *actionName;
GetParameters(child, action.parameters);
connector.Connect( action );
action.actionName = *actionName;
GetParameters(child, action.parameters);
connector.Connect( action );
@@
-714,7
+712,7
@@
Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const
{
const TreeNode::KeyNodePair& key_child = *iter;
{
const TreeNode::KeyNodePair& key_child = *iter;
- DALI_SCRIPT_INFO(" Creating Signal for: %s\n", actor.Get
Name(
).c_str());
+ DALI_SCRIPT_INFO(" Creating Signal for: %s\n", actor.Get
Property< std::string >( Dali::Actor::Property::NAME
).c_str());
OptionalString name( IsString( IsChild( key_child.second, "name")) );
DALI_ASSERT_ALWAYS(name && "Signal must have a name");
OptionalString name( IsString( IsChild( key_child.second, "name")) );
DALI_ASSERT_ALWAYS(name && "Signal must have a name");