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 "On state change, visuals now keep instance data" into devel/master
[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
bd05356
..
939d40e
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) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
@@
-18,8
+18,11
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/intrusive-ptr.h>
+
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-
base-
impl.h>
namespace Dali
{
namespace Dali
{
@@
-30,8
+33,11
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class ColorVisual;
+typedef IntrusivePtr< ColorVisual > ColorVisualPtr;
+
/**
/**
- * The
renderer
which renders a solid color to the control's quad
+ * The
visual
which renders a solid color to the control's quad
*
* The following properties are required for create a ColorRender
*
*
* The following properties are required for create a ColorRender
*
@@
-39,63
+45,59
@@
namespace Internal
* |-----------------|-------------|
* | mixColor | VECTOR4 |
*/
* |-----------------|-------------|
* | mixColor | VECTOR4 |
*/
-class ColorVisual: public Visual
+class ColorVisual: public Visual
::Base
{
public:
/**
{
public:
/**
- * @brief C
onstructor
.
+ * @brief C
reate a new color visual
.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*
* @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.
*/
*/
- ColorVisual( VisualFactoryCache& factoryCache );
-
- /**
- * @brief A reference counted object may only be deleted by calling Unreference().
- */
- virtual ~ColorVisual();
+ static ColorVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::
SetSize
+ * @copydoc Visual::
Base::CreatePropertyMap
*/
*/
- virtual void
SetSize( const Vector2& size )
;
+ virtual void
DoCreatePropertyMap( Property::Map& map ) const
;
/**
/**
- * @copydoc Visual::
SetClipRect
+ * @copydoc Visual::
Base::CreateInstancePropertyMap
*/
*/
- virtual void SetClipRect( const Rect<int>& clipRect );
+ virtual void DoCreateInstancePropertyMap( Property::Map& map ) const;
+
+protected:
/**
/**
- * @copydoc Visual::SetOffset
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*/
*/
-
virtual void SetOffset( const Vector2& offset
);
+
ColorVisual( VisualFactoryCache& factoryCache
);
/**
/**
- * @
copydoc Visual::CreatePropertyMap
+ * @
brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-protected:
+ virtual ~ColorVisual();
/**
/**
- * @copydoc Visual::
DoInitialize
+ * @copydoc Visual::
Base::DoSetProperties
*/
*/
- virtual void Do
Initialize( Actor& actor,
const Property::Map& propertyMap );
+ virtual void Do
SetProperties(
const Property::Map& propertyMap );
/**
/**
- * @copydoc Visual::DoSetOnStage
+ * @copydoc Visual::
Base::
DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
*/
virtual void DoSetOnStage( Actor& actor );
-public:
-
/**
/**
- * Set the color for rendering.
- * @param[in] color The color to be rendered.
+ * @copydoc Visual::Base::OnSetTransform
*/
*/
- v
oid SetColor( const Vector4& color
);
+ v
irtual void OnSetTransform(
);
private:
/**
private:
/**
@@
-110,12
+112,6
@@
private:
// Undefined
ColorVisual& operator=( const ColorVisual& colorRenderer );
// Undefined
ColorVisual& operator=( const ColorVisual& colorRenderer );
-
-private:
-
- Vector4 mMixColor;
- Property::Index mMixColorIndex;
-
};
} // namespace Internal
};
} // namespace Internal