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
fixed align problems when whitespaces are included
[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
99758d1
..
05c8ba9
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.
@@
-63,7
+63,12
@@
public: // from Visual
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
/**
* @copydoc Visual::Base::CreatePropertyMap
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
+ void DoCreatePropertyMap( Property::Map& map ) const override;
+
+ /**
+ * @copydoc Visual::Base::CreateInstancePropertyMap
+ */
+ void DoCreateInstancePropertyMap( Property::Map& map ) const override;
protected:
protected:
@@
-82,25
+87,17
@@
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::DoSetOnStage
*/
/**
* @copydoc Visual::Base::DoSetOnStage
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnStage( Actor& actor ) override
;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- virtual void OnSetTransform();
-
-public:
-
- /**
- * Set the color for rendering.
- * @param[in] color The color to be rendered.
- */
- void SetColor( const Vector4& color );
+ void OnSetTransform() override;
private:
/**
private:
/**
@@
-118,9
+115,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