X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisual-factory%2Fvisual-factory.h;h=1d6be157cb1c4e46ec96b14f1fef2fafd6533b44;hb=1d82abb8a1a514ce0af63004706135fb7883f89b;hp=856360b5c04bc1c2f24411b61881525044874f18;hpb=235a3efd5d00a20adbcae39dfce2c29a6c0344b7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.h b/dali-toolkit/devel-api/visual-factory/visual-factory.h index 856360b..1d6be15 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-factory.h +++ b/dali-toolkit/devel-api/visual-factory/visual-factory.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_VISUAL_FACTORY_H /* - * Copyright (c) 2016 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. @@ -19,8 +19,8 @@ */ // EXTERNAL INCLUDES -#include #include +#include #include // INTERNAL INCLUDES @@ -29,11 +29,10 @@ namespace Dali { class Image; -class Vector4; +struct Vector4; namespace Toolkit { - namespace Internal DALI_INTERNAL { class VisualFactory; @@ -51,10 +50,9 @@ class VisualFactory; * | visualType | INTEGER or STRING | * | shader | MAP | */ -class DALI_IMPORT_API VisualFactory : public BaseHandle +class DALI_TOOLKIT_API VisualFactory : public BaseHandle { public: - /** * @brief Create or retrieve VisualFactory singleton. * @@ -81,7 +79,7 @@ public: * * @param[in] handle A reference to the copied handle. */ - VisualFactory( const VisualFactory& handle ); + VisualFactory(const VisualFactory& handle); /** * @brief This assignment operator is required for (smart) pointer semantics. @@ -89,7 +87,7 @@ public: * @param [in] handle A reference to the copied handle. * @return A reference to this. */ - VisualFactory& operator=( const VisualFactory& handle ); + VisualFactory& operator=(const VisualFactory& handle); /** * @brief Request the visual @@ -98,15 +96,7 @@ public: * The content of the map determines the type of visual that will be returned. * @return The handle to the created visual */ - Visual::Base CreateVisual( const Property::Map& propertyMap ); - - /** - * @brief Request the visual to render the image. - * - * @param[in] image The image to be rendered. - * @return The pointer pointing to the visual - */ - Visual::Base CreateVisual( const Image& image ); + Visual::Base CreateVisual(const Property::Map& propertyMap); /** * @brief Request the visual to render the given resource at the url. @@ -115,7 +105,7 @@ public: * @param[in] size The width and height to fit the loaded image to. * @return The pointer pointing to the visual */ - Visual::Base CreateVisual( const std::string& url, ImageDimensions size ); + Visual::Base CreateVisual(const std::string& url, ImageDimensions size); /** * @brief Enable or disable premultiplying alpha in images and image visuals. @@ -127,7 +117,7 @@ public: * @param[in] preMultiply True if loaded images for image visuals should have alpha multiplied into the color * channels. */ - void SetPreMultiplyOnLoad( bool preMultiply ); + void SetPreMultiplyOnLoad(bool preMultiply); /** * @brief Get the setting for automatically pre-multiplying image visual images on load. @@ -137,9 +127,7 @@ public: bool GetPreMultiplyOnLoad() const; private: - - explicit DALI_INTERNAL VisualFactory(Internal::VisualFactory *impl); - + explicit DALI_INTERNAL VisualFactory(Internal::VisualFactory* impl); }; } // namespace Toolkit