X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Ftype-info-impl.h;h=54cfe2248a254259a033e88b7ba3105a5689aa4c;hb=aee2350a06fac17860817a0e84ff97a4553dbbaa;hp=d3fcfda4ffc1a39896ed0357d8155a340592899b;hpb=ba99c2fc92c63f4a7a513813dfc5e76cc502b831;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/type-info-impl.h b/dali/internal/event/common/type-info-impl.h index d3fcfda..54cfe22 100644 --- a/dali/internal/event/common/type-info-impl.h +++ b/dali/internal/event/common/type-info-impl.h @@ -25,13 +25,17 @@ #include #include #include +#include #include +#include namespace Dali { namespace Internal { +class PropertyDetails; +class TypeRegistry; /** * A TypeInfo class to support registered type creation, and introspection of available @@ -43,13 +47,15 @@ namespace Internal class TypeInfo : public BaseObject { public: + /** * Create TypeInfo * @param [name] the registered name * @param [baseName] the base type registered name * @param [creator] the creator function for this type */ - TypeInfo(const std::string& name, const std::string& baseName, Dali::TypeInfo::CreateFunction creator); + TypeInfo( const std::string& name, const std::string& baseName, Dali::TypeInfo::CreateFunction creator, + const Dali::PropertyDetails* defaultProperties, Property::Index defaultPropertyCount ); /** * Create TypeInfo for a csharp object @@ -57,7 +63,7 @@ public: * @param [baseName] the base type registered name * @param [creator] the creator function for this type */ - TypeInfo(const std::string& name, const std::string& baseName, Dali::CSharpTypeInfo::CreateFunction creator); + TypeInfo( const std::string& name, const std::string& baseName, Dali::CSharpTypeInfo::CreateFunction creator ); /** * Destructor @@ -117,8 +123,17 @@ public: /** * @copydoc Dali::TypeInfo::GetPropertyName() const + * this API exists to keep the old public API, which cannot be changed */ - const std::string& GetPropertyName( Property::Index index ) const; + const std::string& GetRegisteredPropertyName( Property::Index index ) const; + + /** + * Returns the property name for given index + * + * @param index of the property + * @return name or empty string + */ + std::string GetPropertyName( Property::Index index ) const; /* * Add an action function @@ -137,7 +152,7 @@ public: * @param[in] name The name of the property. * @param[in] index The index of the property. * @param[in] type The Property::Type. - * @param[in] setFunc The function to call to set the property (Can be NULL). + * @param[in] setFunc The function to call to set the property (Can be nullptr). * @param[in] getFunc The function to call to retrieve the value of the property. */ void AddProperty( const std::string& name, Property::Index index, Property::Type type, Dali::TypeInfo::SetPropertyFunction setFunc, Dali::TypeInfo::GetPropertyFunction getFunc ); @@ -147,7 +162,7 @@ public: * @param[in] name The name of the property. * @param[in] index The index of the property. * @param[in] type The Property::Type. - * @param[in] setFunc The function to call to set the property (Can be NULL). + * @param[in] setFunc The function to call to set the property (Can be nullptr). * @param[in] getFunc The function to call to retrieve the value of the property. */ void AddProperty( const std::string& name, Property::Index index, Property::Type type, Dali::CSharpTypeInfo::SetPropertyFunction setFunc, Dali::CSharpTypeInfo::GetPropertyFunction getFunc); @@ -228,13 +243,24 @@ public: int32_t GetComponentIndex( Property::Index index ) const; /** - * Checks if there is a setter for the property. If there is then it is writable. * @param[in] index The property index. * @return True, if writable, false otherwise. */ bool IsPropertyWritable( Property::Index index ) const; /** + * @param[in] index The property index. + * @return True, if animatable, false otherwise. + */ + bool IsPropertyAnimatable( Property::Index index ) const; + + /** + * @param[in] index The property index. + * @return True, if a constraint input, false otherwise. + */ + bool IsPropertyAConstraintInput( Property::Index index ) const; + + /** * Retrieve the Property::Type of the property at the given index. * @param[in] index The property index. * @return The Property::Type at that index. @@ -311,20 +337,10 @@ private: struct RegisteredProperty { - RegisteredProperty() - : type( Property::NONE ), - setFunc( NULL ), - getFunc( NULL ), - name(), - basePropertyIndex(Property::INVALID_INDEX), - componentIndex(Property::INVALID_COMPONENT_INDEX) - { - } - RegisteredProperty( Property::Type propType, const std::string& propName, Property::Index basePropertyIndex, int32_t componentIndex ) : type( propType ), - setFunc( NULL ), - getFunc( NULL ), + setFunc( nullptr ), + getFunc( nullptr ), name( propName ), basePropertyIndex(basePropertyIndex), componentIndex(componentIndex) @@ -352,21 +368,20 @@ private: { } - - Property::Type type; + Property::Type type = Property::NONE; union { - Dali::TypeInfo::SetPropertyFunction setFunc; - Dali::CSharpTypeInfo::SetPropertyFunction cSharpSetFunc; + Dali::TypeInfo::SetPropertyFunction setFunc = nullptr; + Dali::CSharpTypeInfo::SetPropertyFunction cSharpSetFunc; // only one field can be initialized but this will have same value anyways }; union { - Dali::TypeInfo::GetPropertyFunction getFunc; - Dali::CSharpTypeInfo::GetPropertyFunction cSharpGetFunc; + Dali::TypeInfo::GetPropertyFunction getFunc = nullptr; + Dali::CSharpTypeInfo::GetPropertyFunction cSharpGetFunc; // only one field can be initialized but this will have same value anyways }; std::string name; - Property::Index basePropertyIndex; - int32_t componentIndex; + Property::Index basePropertyIndex = Property::INVALID_INDEX; + int32_t componentIndex = Property::INVALID_COMPONENT_INDEX; }; typedef std::pair ConnectionPair; @@ -379,7 +394,6 @@ private: typedef std::vector< RegisteredPropertyPair > RegisteredPropertyContainer; typedef std::vector< PropertyDefaultValuePair > PropertyDefaultValueContainer; - /** * Append properties from registeredProperties onto indices. * @param[in,out] indices The vector to append indices onto @@ -390,19 +404,23 @@ private: private: + TypeRegistry& mTypeRegistry; + mutable Internal::TypeInfo* mBaseType; // allow changing from const methods, initialised inside constructor std::string mTypeName; std::string mBaseTypeName; - bool mCSharpType:1; ///< Whether this type info is for a CSharp control (instead of C++) union { - Dali::TypeInfo::CreateFunction mCreate; - Dali::CSharpTypeInfo::CreateFunction mCSharpCreate; + Dali::TypeInfo::CreateFunction mCreate = nullptr; + Dali::CSharpTypeInfo::CreateFunction mCSharpCreate; // only one field can be initialized but this will have same value anyways }; ActionContainer mActions; ConnectorContainer mSignalConnectors; RegisteredPropertyContainer mRegisteredProperties; RegisteredPropertyContainer mRegisteredChildProperties; PropertyDefaultValueContainer mPropertyDefaultValues; + const Dali::PropertyDetails* mDefaultProperties = nullptr; + Property::Index mDefaultPropertyCount = 0; + bool mCSharpType = false; ///< Whether this type info is for a CSharp control (instead of C++) }; } // namespace Internal