Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / event / common / type-registry-impl.cpp

diff --git a/dali/internal/event/common/type-registry-impl.cpp b/dali/internal/event/common/type-registry-impl.cpp
index d875fc5..5d61e49 100644 (file)
--- a/dali/internal/event/common/type-registry-impl.cpp
+++ b/dali/internal/event/common/type-registry-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -157,6 +157,32 @@ bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_
   return ret;
 }
 
+bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_info& baseTypeInfo,
+    Dali::CSharpTypeInfo::CreateFunction createInstance )
+{
+
+  bool ret = false;
+
+  std::string baseTypeName    = DemangleClassName(baseTypeInfo.name());
+
+  RegistryMap::iterator iter = mRegistryLut.find(uniqueTypeName);
+
+  if( iter == mRegistryLut.end() )
+  {
+    mRegistryLut[uniqueTypeName] = Dali::TypeInfo(new Internal::TypeInfo(uniqueTypeName, baseTypeName, createInstance));
+    ret = true;
+    DALI_LOG_INFO( gLogFilter, Debug::Concise, "Type Registration %s(%s)\n", uniqueTypeName.c_str(), baseTypeName.c_str());
+  }
+  else
+  {
+    DALI_LOG_WARNING("Duplicate name for TypeRegistry for '%s'\n", + uniqueTypeName.c_str());
+    DALI_ASSERT_ALWAYS(!"Duplicate type name for Type Registation");
+  }
+
+  return ret;
+
+}
+
 void TypeRegistry::CallInitFunctions(void) const
 {
   for( InitFunctions::const_iterator iter = mInitFunctions.begin(); iter != mInitFunctions.end(); ++iter)
@@ -216,6 +242,24 @@ bool TypeRegistry::RegisterProperty( TypeRegistration& registered, const std::st
   return false;
 }
 
+bool TypeRegistry::RegisterProperty( const std::string& objectName, const std::string& name, Property::Index index, Property::Type type, Dali::CSharpTypeInfo::SetPropertyFunction setFunc, Dali::CSharpTypeInfo::GetPropertyFunction getFunc )
+{
+  RegistryMap::iterator iter = mRegistryLut.find( objectName );
+
+  if( iter != mRegistryLut.end() )
+  {
+    DALI_ASSERT_DEBUG(iter->second);
+
+    GetImplementation(iter->second).AddProperty( name, index, type, setFunc, getFunc );
+
+    return true;
+  }
+
+  return false;
+
+}
+
+
 bool TypeRegistry::RegisterAnimatableProperty( TypeRegistration& registered, const std::string& name, Property::Index index, Property::Type type )
 {
   RegistryMap::iterator iter = mRegistryLut.find( registered.RegisteredName() );
@@ -232,6 +276,22 @@ bool TypeRegistry::RegisterAnimatableProperty( TypeRegistration& registered, con
   return false;
 }
 
+bool TypeRegistry::RegisterAnimatableProperty( TypeRegistration& registered, const std::string& name, Property::Index index, const Property::Value& value )
+{
+  RegistryMap::iterator iter = mRegistryLut.find( registered.RegisteredName() );
+
+  if( iter != mRegistryLut.end() )
+  {
+    DALI_ASSERT_DEBUG(iter->second);
+
+    GetImplementation(iter->second).AddAnimatableProperty( name, index, value );
+
+    return true;
+  }
+
+  return false;
+}
+
 bool TypeRegistry::RegisterAnimatablePropertyComponent( TypeRegistration& registered, const std::string& name, Property::Index index, Property::Index baseIndex, unsigned int componentIndex )
 {
   RegistryMap::iterator iter = mRegistryLut.find( registered.RegisteredName() );
@@ -248,6 +308,22 @@ bool TypeRegistry::RegisterAnimatablePropertyComponent( TypeRegistration& regist
   return false;
 }
 
+bool TypeRegistry::RegisterChildProperty( TypeRegistration& registered, const std::string& name, Property::Index index, Property::Type type )
+{
+  RegistryMap::iterator iter = mRegistryLut.find( registered.RegisteredName() );
+
+  if( iter != mRegistryLut.end() )
+  {
+    DALI_ASSERT_DEBUG(iter->second);
+
+    GetImplementation(iter->second).AddChildProperty( name, index, type );
+
+    return true;
+  }
+
+  return false;
+}
+
 bool TypeRegistry::DoActionTo( BaseObject * const object, const std::string &actionName, const Property::Map &properties)
 {
   bool done = false;
@@ -301,7 +377,8 @@ Dali::TypeInfo TypeRegistry::GetTypeInfo(const Dali::BaseObject * const pBaseObj
 
   if(pCustom)
   {
-    type = GetTypeInfo( typeid( pCustom->GetImplementation() ) );
+    const Dali::CustomActorImpl& custom = pCustom->GetImplementation();
+    type = GetTypeInfo( typeid( custom ) );
   }
   else
   {