projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add a TextEditor property to limit input to maximum characters" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
color
/
color-visual.h
diff --git
a/dali-toolkit/internal/visuals/color/color-visual.h
b/dali-toolkit/internal/visuals/color/color-visual.h
index
a8214ea
..
d5b2a6f
100644
(file)
--- a/
dali-toolkit/internal/visuals/color/color-visual.h
+++ b/
dali-toolkit/internal/visuals/color/color-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-53,26
+53,22
@@
public:
* @brief Create a new color visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new color visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @return A smart-pointer to the newly allocated visual.
*/
- static ColorVisualPtr New( VisualFactoryCache& factoryCache );
+ static ColorVisualPtr New( VisualFactoryCache& factoryCache
, const Property::Map& properties
);
public: // from Visual
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
public: // from Visual
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- v
irtual void DoCreatePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreatePropertyMap( Property::Map& map ) const override
;
/**
/**
- * @copydoc Visual::Base::
DoSetProperty
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
-
- /**
- * @copydoc Visual::Base::DoGetProperty
- */
- virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
+ void DoCreateInstancePropertyMap( Property::Map& map ) const override;
protected:
protected:
@@
-91,25
+87,22
@@
protected:
/**
* @copydoc Visual::Base::DoSetProperties
*/
/**
* @copydoc Visual::Base::DoSetProperties
*/
- v
irtual void DoSetProperties( const Property::Map& propertyMap )
;
+ v
oid DoSetProperties( const Property::Map& propertyMap ) override
;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnScene( Actor& actor ) override
;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- virtual void OnSetTransform();
-
-public:
+ void OnSetTransform() override;
/**
/**
- * Set the color for rendering.
- * @param[in] color The color to be rendered.
+ * @copydoc Visual::Base::OnDoAction
*/
*/
- void
SetColor( const Vector4& color )
;
+ void
OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override
;
private:
/**
private:
/**
@@
-127,9
+120,8
@@
private:
private:
private:
- Vector4 mMixColor;
- Property::Index mMixColorIndex;
-
+ float mBlurRadius; ///< The blur radius
+ bool mRenderIfTransparent; ///< Whether we should render even if the mix-color is transparent.
};
} // namespace Internal
};
} // namespace Internal