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
Automatically dis/connect registered visuals to stage
[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
..
2805d6a
100644
(file)
--- a/
dali-toolkit/internal/visuals/color/color-visual.h
+++ b/
dali-toolkit/internal/visuals/color/color-visual.h
@@
-19,7
+19,7
@@
*/
// 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
{
@@
-31,7
+31,7
@@
namespace Internal
{
/**
{
/**
- * 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,7
+39,7
@@
namespace Internal
* |-----------------|-------------|
* | mixColor | VECTOR4 |
*/
* |-----------------|-------------|
* | mixColor | VECTOR4 |
*/
-class ColorVisual: public Visual
+class ColorVisual: public Visual
::Base
{
public:
{
public:
@@
-58,34
+58,24
@@
public:
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::SetSize
+ * @copydoc Visual::
Base::
SetSize
*/
virtual void SetSize( const Vector2& size );
/**
*/
virtual void SetSize( const Vector2& size );
/**
- * @copydoc Visual::SetClipRect
- */
- virtual void SetClipRect( const Rect<int>& clipRect );
-
- /**
- * @copydoc Visual::SetOffset
- */
- virtual void SetOffset( const Vector2& offset );
-
- /**
- * @copydoc Visual::CreatePropertyMap
+ * @copydoc Visual::Base::CreatePropertyMap
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
protected:
/**
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
protected:
/**
- * @copydoc Visual::DoInitialize
+ * @copydoc Visual::
Base::
DoInitialize
*/
virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
/**
*/
virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
/**
- * @copydoc Visual::DoSetOnStage
+ * @copydoc Visual::
Base::
DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
*/
virtual void DoSetOnStage( Actor& actor );