/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
#include <dali/internal/event/common/type-registry-impl.h>
// INTERNAL INCLUDES
-#include <dali/internal/event/common/thread-local-storage.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/base-handle.h>
#include <dali/internal/event/actors/custom-actor-internal.h>
#include <dali/internal/event/common/demangler.h>
+#include <dali/internal/event/common/thread-local-storage.h>
#include <dali/integration-api/debug.h>
namespace Dali
{
-extern std::string Demangle(const char* symbol);
-
namespace Internal
{
return _reg;
}
-TypeRegistry::TypeRegistry()
-{
-
-}
+TypeRegistry::TypeRegistry() = default;
TypeRegistry::~TypeRegistry()
{
mRegistryLut.clear();
}
-Dali::TypeInfo TypeRegistry::GetTypeInfo( const std::string& uniqueTypeName )
+TypeRegistry::TypeInfoPointer TypeRegistry::GetTypeInfo( const std::string& uniqueTypeName )
{
for( auto&& iter : mRegistryLut )
{
// Note! mRegistryLut contains Dali::TypeInfo handles, so cannot call GetTypeName()
// as it calls us back resulting in infinite loop (GetTypeName is in BaseHandle part)
- if( GetImplementation( iter ).GetName() == uniqueTypeName )
+ if( iter->GetName() == uniqueTypeName )
{
return iter;
}
}
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Cannot find requested type '%s'\n", uniqueTypeName.c_str() );
- return Dali::TypeInfo();
+ return TypeRegistry::TypeInfoPointer();
}
-Dali::TypeInfo TypeRegistry::GetTypeInfo( const std::type_info& registerType )
+TypeRegistry::TypeInfoPointer TypeRegistry::GetTypeInfo( const std::type_info& registerType )
{
std::string typeName = DemangleClassName( registerType.name() );
return GetTypeInfo( typeName );
}
-size_t TypeRegistry::GetTypeNameCount() const
+uint32_t TypeRegistry::GetTypeNameCount() const
{
- return mRegistryLut.size();
+ return static_cast<uint32_t>( mRegistryLut.size() );
}
-
-std::string TypeRegistry::GetTypeName( size_t index ) const
+const std::string& TypeRegistry::GetTypeName(uint32_t index) const
{
- std::string name;
+ static std::string EMPTY_STRING{};
if( index < mRegistryLut.size() )
{
- name = GetImplementation( mRegistryLut[ index ] ).GetName();
+ return mRegistryLut[index]->GetName();
}
- return name;
+ return EMPTY_STRING;
}
-
-bool TypeRegistry::Register( const std::type_info& theTypeInfo, const std::type_info& baseTypeInfo,
- Dali::TypeInfo::CreateFunction createInstance, bool callCreateOnInit )
+std::string TypeRegistry::Register( const std::type_info& theTypeInfo,
+ const std::type_info& baseTypeInfo,
+ Dali::TypeInfo::CreateFunction createInstance,
+ bool callCreateOnInit )
{
std::string uniqueTypeName = DemangleClassName( theTypeInfo.name() );
return Register( uniqueTypeName, baseTypeInfo, createInstance, callCreateOnInit );
}
-bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_info& baseTypeInfo,
- Dali::TypeInfo::CreateFunction createInstance, bool callCreateOnInit )
+std::string TypeRegistry::Register( const std::type_info& theTypeInfo,
+ const std::type_info& baseTypeInfo,
+ Dali::TypeInfo::CreateFunction createInstance,
+ bool callCreateOnInit,
+ const Dali::PropertyDetails* defaultProperties,
+ Property::Index defaultPropertyCount )
+{
+ std::string uniqueTypeName = DemangleClassName( theTypeInfo.name() );
+
+ return Register( uniqueTypeName, baseTypeInfo, createInstance, callCreateOnInit, defaultProperties, defaultPropertyCount );
+}
+
+std::string TypeRegistry::Register(std::string uniqueTypeName,
+ const std::type_info& baseTypeInfo,
+ Dali::TypeInfo::CreateFunction createInstance,
+ bool callCreateOnInit,
+ const Dali::PropertyDetails* defaultProperties,
+ Property::Index defaultPropertyCount)
{
std::string baseTypeName = DemangleClassName( baseTypeInfo.name() );
// check for duplicates using uniqueTypeName
for( auto&& iter : mRegistryLut )
{
- if( GetImplementation( iter ).GetName() == uniqueTypeName )
+ if( iter->GetName() == uniqueTypeName )
{
DALI_LOG_WARNING( "Duplicate name in TypeRegistry for '%s'\n", + uniqueTypeName.c_str() );
DALI_ASSERT_ALWAYS( !"Duplicate type name in Type Registration" );
- return false;
+ return uniqueTypeName; // never actually happening due to the assert
}
}
- mRegistryLut.push_back( Dali::TypeInfo( new Internal::TypeInfo( uniqueTypeName, baseTypeName, createInstance ) ) );
+ mRegistryLut.push_back( TypeRegistry::TypeInfoPointer(
+ new Internal::TypeInfo( uniqueTypeName, baseTypeName, createInstance, defaultProperties, defaultPropertyCount ) ) );
DALI_LOG_INFO( gLogFilter, Debug::Concise, "Type Registration %s(%s)\n", uniqueTypeName.c_str(), baseTypeName.c_str() );
if( callCreateOnInit )
mInitFunctions.push_back(createInstance);
}
- return true;
+ return uniqueTypeName;
}
-bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_info& baseTypeInfo,
- Dali::CSharpTypeInfo::CreateFunction createInstance )
+void TypeRegistry::Register(std::string uniqueTypeName, const std::type_info& baseTypeInfo, Dali::CSharpTypeInfo::CreateFunction createInstance)
{
std::string baseTypeName = DemangleClassName( baseTypeInfo.name() );
// check for duplicates using uniqueTypeName
for( auto&& iter : mRegistryLut )
{
- if( GetImplementation( iter ).GetName() == uniqueTypeName )
+ if( iter->GetName() == uniqueTypeName )
{
DALI_LOG_WARNING( "Duplicate name in TypeRegistry for '%s'\n", + uniqueTypeName.c_str() );
DALI_ASSERT_ALWAYS( !"Duplicate type name in Type Registration" );
- return false;
+ return; // never actually happening due to the assert
}
}
- mRegistryLut.push_back( Dali::TypeInfo( new Internal::TypeInfo( uniqueTypeName, baseTypeName, createInstance ) ) );
+ mRegistryLut.push_back( TypeRegistry::TypeInfoPointer( new Internal::TypeInfo( uniqueTypeName, baseTypeName, createInstance ) ) );
DALI_LOG_INFO( gLogFilter, Debug::Concise, "Type Registration %s(%s)\n", uniqueTypeName.c_str(), baseTypeName.c_str() );
-
- return true;
}
void TypeRegistry::CallInitFunctions(void) const
return DemangleClassName( registerType.name() );
}
-void TypeRegistry::RegisterSignal( TypeRegistration& typeRegistration, const std::string& name, Dali::TypeInfo::SignalConnectorFunction func )
+void TypeRegistry::RegisterSignal(TypeRegistration& typeRegistration, std::string name, Dali::TypeInfo::SignalConnectorFunction func)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == typeRegistration.RegisteredName() )
+ if( iter->GetName() == typeRegistration.RegisteredName() )
{
- impl.AddConnectorFunction( name, func );
+ iter->AddConnectorFunction(std::move(name), func);
break;
}
}
}
-bool TypeRegistry::RegisterAction( TypeRegistration& typeRegistration, const std::string &name, Dali::TypeInfo::ActionFunction f )
+bool TypeRegistry::RegisterAction(TypeRegistration& typeRegistration, std::string name, Dali::TypeInfo::ActionFunction f)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == typeRegistration.RegisteredName() )
+ if( iter->GetName() == typeRegistration.RegisteredName() )
{
- impl.AddActionFunction( name, f );
+ iter->AddActionFunction(std::move(name), f);
return true;
}
}
return false;
}
-bool TypeRegistry::RegisterProperty( TypeRegistration& typeRegistration, const std::string& name, Property::Index index, Property::Type type, Dali::TypeInfo::SetPropertyFunction setFunc, Dali::TypeInfo::GetPropertyFunction getFunc )
+bool TypeRegistry::RegisterProperty(TypeRegistration& typeRegistration, std::string name, Property::Index index, Property::Type type, Dali::TypeInfo::SetPropertyFunction setFunc, Dali::TypeInfo::GetPropertyFunction getFunc)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == typeRegistration.RegisteredName() )
+ if( iter->GetName() == typeRegistration.RegisteredName() )
{
- impl.AddProperty( name, index, type, setFunc, getFunc );
+ iter->AddProperty(std::move(name), index, type, setFunc, getFunc);
return true;
}
}
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 )
+bool TypeRegistry::RegisterProperty(const std::string& objectName, std::string name, Property::Index index, Property::Type type, Dali::CSharpTypeInfo::SetPropertyFunction setFunc, Dali::CSharpTypeInfo::GetPropertyFunction getFunc)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == objectName )
+ if( iter->GetName() == objectName )
{
- impl.AddProperty( name, index, type, setFunc, getFunc );
+ iter->AddProperty(std::move(name), index, type, setFunc, getFunc);
return true;
}
}
return false;
}
-
-bool TypeRegistry::RegisterAnimatableProperty( TypeRegistration& typeRegistration, const std::string& name, Property::Index index, Property::Type type )
+bool TypeRegistry::RegisterAnimatableProperty(TypeRegistration& typeRegistration, std::string name, Property::Index index, Property::Type type)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == typeRegistration.RegisteredName() )
+ if( iter->GetName() == typeRegistration.RegisteredName() )
{
- impl.AddAnimatableProperty( name, index, type );
+ iter->AddAnimatableProperty(std::move(name), index, type);
return true;
}
}
return false;
}
-bool TypeRegistry::RegisterAnimatableProperty( TypeRegistration& typeRegistration, const std::string& name, Property::Index index, const Property::Value& value )
+bool TypeRegistry::RegisterAnimatableProperty(TypeRegistration& typeRegistration, std::string name, Property::Index index, Property::Value value)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == typeRegistration.RegisteredName() )
+ if( iter->GetName() == typeRegistration.RegisteredName() )
{
- impl.AddAnimatableProperty( name, index, value );
+ iter->AddAnimatableProperty(std::move(name), index, std::move(value));
return true;
}
}
return false;
}
-bool TypeRegistry::RegisterAnimatablePropertyComponent( TypeRegistration& typeRegistration, const std::string& name, Property::Index index, Property::Index baseIndex, unsigned int componentIndex )
+bool TypeRegistry::RegisterAnimatablePropertyComponent(TypeRegistration& typeRegistration, std::string name, Property::Index index, Property::Index baseIndex, unsigned int componentIndex)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == typeRegistration.RegisteredName() )
+ if( iter->GetName() == typeRegistration.RegisteredName() )
{
- impl.AddAnimatablePropertyComponent( name, index, baseIndex, componentIndex );
+ iter->AddAnimatablePropertyComponent(std::move(name), index, baseIndex, componentIndex);
return true;
}
}
return false;
}
-bool TypeRegistry::RegisterChildProperty( const std::string& registeredType, const std::string& name, Property::Index index, Property::Type type )
+bool TypeRegistry::RegisterChildProperty(const std::string& registeredType, std::string name, Property::Index index, Property::Type type)
{
for( auto&& iter : mRegistryLut )
{
- auto&& impl = GetImplementation( iter );
- if( impl.GetName() == registeredType )
+ if( iter->GetName() == registeredType )
{
- impl.AddChildProperty( name, index, type );
+ iter->AddChildProperty(std::move(name), index, type);
return true;
}
}
return false;
}
-bool TypeRegistry::RegisterChildProperty( TypeRegistration& typeRegistration, const std::string& name, Property::Index index, Property::Type type )
+bool TypeRegistry::RegisterChildProperty(TypeRegistration& typeRegistration, std::string name, Property::Index index, Property::Type type)
{
- return RegisterChildProperty( typeRegistration.RegisteredName(), name, index, type );
+ return RegisterChildProperty(typeRegistration.RegisteredName(), std::move(name), index, type);
}
bool TypeRegistry::DoActionTo( BaseObject * const object, const std::string& actionName, const Property::Map& properties )
{
bool done = false;
- Dali::TypeInfo type = GetTypeInfo( object );
+ auto&& type = GetTypeInfo( object );
- while( type )
+ // DoActionTo recurses through base classes
+ done = type->DoActionTo( object, actionName, properties );
+
+ if( !done )
{
- auto&& impl = GetImplementation( type );
- if( impl.DoActionTo( object, actionName, properties ) )
- {
- done = true;
- break;
- }
- type = GetTypeInfo( impl.GetBaseName() );
+ DALI_LOG_WARNING("Type '%s' cannot do action '%s'\n", type->GetName().c_str(), actionName.c_str());
}
return done;
{
bool connected( false );
- Dali::TypeInfo type = GetTypeInfo( object );
+ auto&& type = GetTypeInfo( object );
- while( type )
- {
- auto&& impl = GetImplementation( type );
- connected = impl.ConnectSignal( object, connectionTracker, signalName, functor );
- if( connected )
- {
- break;
- }
- type = GetTypeInfo( impl.GetBaseName() );
- }
+ // Connect iterates through base classes
+ connected = type->ConnectSignal( object, connectionTracker, signalName, functor );
if( !connected )
{
+ DALI_LOG_WARNING("Type '%s' signal '%s' connection failed \n", type->GetName().c_str(), signalName.c_str());
// Ownership of functor was not passed to Dali::CallbackBase, so clean-up now
delete functor;
}
return connected;
}
-Dali::TypeInfo TypeRegistry::GetTypeInfo(const Dali::BaseObject * const pBaseObject)
+TypeRegistry::TypeInfoPointer TypeRegistry::GetTypeInfo(const Dali::BaseObject * const pBaseObject)
{
- Dali::TypeInfo type;
+ TypeInfoPointer type;
// test for custom actor which has another indirection to get to the type hiearchy we're after
const Dali::Internal::CustomActor * const pCustom = dynamic_cast<const Dali::Internal::CustomActor*>(pBaseObject);
- if(pCustom)
+ if( pCustom )
{
const Dali::CustomActorImpl& custom = pCustom->GetImplementation();
type = GetTypeInfo( typeid( custom ) );
+ if( !type )
+ {
+ // the most derived type is a descendant of custom actor but has not registered itself
+ // so we'll just treat it as a custom actor for now so it "inherits" all of actors properties, actions and signals
+ type = GetTypeInfo( typeid( Dali::Internal::CustomActor ) );
+ }
}
else
{
projects / platform / core / uifw / dali-core.git / blobdiff