X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fborder%2Fborder-visual.h;h=42ebe6960d62083e4671c8a4d62d21bd7d37120c;hp=15cb5bf573c5f5e883aec58ae5fe071b55f20024;hb=9ddd5fea6278d06b8874988498c7c4c6508750ba;hpb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d diff --git a/dali-toolkit/internal/visuals/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h index 15cb5bf..42ebe69 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.h +++ b/dali-toolkit/internal/visuals/border/border-visual.h @@ -19,23 +19,20 @@ */ // EXTERNAL INCLUDES -#include #include +#include // INTERNAL INCLUDES #include namespace Dali { - namespace Toolkit { - namespace Internal { - class BorderVisual; -typedef IntrusivePtr< BorderVisual > BorderVisualPtr; +typedef IntrusivePtr BorderVisualPtr; /** * The visual which renders a solid color to the control's quad border fixed to a specified size. @@ -51,7 +48,6 @@ typedef IntrusivePtr< BorderVisual > BorderVisualPtr; class BorderVisual : public Visual::Base { public: - /** * @brief Create a new border visual. * @@ -59,16 +55,15 @@ public: * @param[in] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual. */ - static BorderVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties ); + static BorderVisualPtr New(VisualFactoryCache& factoryCache, const Property::Map& properties); protected: - /** * @brief Constructor. * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object */ - BorderVisual( VisualFactoryCache& factoryCache ); + BorderVisual(VisualFactoryCache& factoryCache); /** * @brief A reference counted object may only be deleted by calling Unreference(). @@ -83,22 +78,22 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - void DoSetProperties( const Property::Map& propertyMap ) override; + void DoSetProperties(const Property::Map& propertyMap) override; /** * @copydoc Visual::Base::DoSetOnScene */ - void DoSetOnScene( Actor& actor ) override; + void DoSetOnScene(Actor& actor) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - void DoCreatePropertyMap( Property::Map& map ) const override; + void DoCreatePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - void DoCreateInstancePropertyMap( Property::Map& map ) const override; + void DoCreateInstancePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::OnSetTransform @@ -106,7 +101,6 @@ protected: void OnSetTransform() override; private: - /** * Request the border shader from the factory cache. If fail, create tha shader and add it to cache. * @return The border shader. @@ -124,16 +118,15 @@ private: * @param[in] index The index key of the value * @param[in] value The value */ - void DoSetProperty( Property::Index index, const Property::Value& value ); + void DoSetProperty(Property::Index index, const Property::Value& value); // Undefined - BorderVisual( const BorderVisual& borderRenderer ); + BorderVisual(const BorderVisual& borderRenderer); // Undefined - BorderVisual& operator=( const BorderVisual& borderRenderer ); + BorderVisual& operator=(const BorderVisual& borderRenderer); private: - Vector4 mBorderColor; float mBorderSize;