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 "DALi Version 2.0.5" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
gradient
/
gradient-visual.h
diff --git
a/dali-toolkit/internal/visuals/gradient/gradient-visual.h
b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
index
5171b12
..
71ae1d6
100644
(file)
--- a/
dali-toolkit/internal/visuals/gradient/gradient-visual.h
+++ b/
dali-toolkit/internal/visuals/gradient/gradient-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-88,31
+88,22
@@
public:
* @brief Create a new gradient visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new gradient 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 GradientVisualPtr New( VisualFactoryCache& factoryCache );
+ static GradientVisualPtr New( VisualFactoryCache& factoryCache
, const Property::Map& properties
);
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::Base::SetSize
- */
- virtual void SetSize( const Vector2& size );
-
- /**
* @copydoc Visual::Base::CreatePropertyMap
*/
* @copydoc Visual::Base::CreatePropertyMap
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
- /**
- * @copydoc Visual::Base::DoSetProperty
- */
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+ void DoCreatePropertyMap( Property::Map& map ) const override;
/**
/**
- * @copydoc Visual::Base::
DoGetProperty
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- v
irtual Dali::Property::Value DoGetProperty( Dali::Property::Index index )
;
+ v
oid DoCreateInstancePropertyMap( Property::Map& map ) const override
;
protected:
protected:
@@
-129,14
+120,24
@@
protected:
virtual ~GradientVisual();
/**
virtual ~GradientVisual();
/**
- * @copydoc Visual::Base::Do
Initialize
+ * @copydoc Visual::Base::Do
SetProperties
*/
*/
- v
irtual void DoInitialize( Actor& actor, const Property::Map& propertyMap )
;
+ v
oid DoSetProperties( const Property::Map& propertyMap ) override
;
/**
/**
- * @copydoc Visual::Base::
DoSetOnStage
+ * @copydoc Visual::Base::
OnSetTransform
*/
*/
- virtual void DoSetOnStage( Actor& actor );
+ void OnSetTransform() override;
+
+ /**
+ * @copydoc Visual::Base::DoSetOnScene
+ */
+ void DoSetOnScene( Actor& actor ) override;
+
+ /**
+ * @copydoc Visual::Base::UpdateShader
+ */
+ void UpdateShader() override;
private:
private:
@@
-153,6
+154,12
@@
private:
bool NewGradient(Type gradientType, const Property::Map& propertyMap);
/**
bool NewGradient(Type gradientType, const Property::Map& propertyMap);
/**
+ * @brief Get a shader for the current properties.
+ * @return The shader for the current properties.
+ */
+ Shader GetShader();
+
+ /**
* Get the stop-offsets from the property.
* The valid property type are ARRAY, VECTOR2, VECTOR3, VECTOR4.
*
* Get the stop-offsets from the property.
* The valid property type are ARRAY, VECTOR2, VECTOR3, VECTOR4.
*
@@
-172,6
+179,7
@@
private:
Matrix3 mGradientTransform;
IntrusivePtr<Gradient> mGradient;
Type mGradientType;
Matrix3 mGradientTransform;
IntrusivePtr<Gradient> mGradient;
Type mGradientType;
+ bool mIsOpaque; ///< Set to false if any of the stop colors are not opaque
};
} // namespace Internal
};
} // namespace Internal