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
Added some TextField boilerplate code
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
text
/
decorator
/
text-decorator.h
diff --git
a/dali-toolkit/public-api/text/decorator/text-decorator.h
b/dali-toolkit/public-api/text/decorator/text-decorator.h
index
b9adf17
..
e3501b1
100644
(file)
--- a/
dali-toolkit/public-api/text/decorator/text-decorator.h
+++ b/
dali-toolkit/public-api/text/decorator/text-decorator.h
@@
-32,7
+32,10
@@
class Vector4;
namespace Toolkit
{
namespace Toolkit
{
-class ControlImpl;
+namespace Internal
+{
+class Control;
+}
namespace Text
{
namespace Text
{
@@
-72,7
+75,7
@@
public:
* @param[in] parent Decorations will be added to this parent control.
* @return A pointer to a new Decorator.
*/
* @param[in] parent Decorations will be added to this parent control.
* @return A pointer to a new Decorator.
*/
- static DecoratorPtr New(
ControlImp
l& parent );
+ static DecoratorPtr New(
Internal::Contro
l& parent );
/**
* @brief The decorator waits until a relayout before creating actors etc.
/**
* @brief The decorator waits until a relayout before creating actors etc.
@@
-119,22
+122,21
@@
public:
/**
* @brief Sets the image for a cursor.
*
/**
* @brief Sets the image for a cursor.
*
- * @param[in] cursor The cursor to set.
* @param[in] image The image to use.
*/
* @param[in] image The image to use.
*/
- void Set
Image( Cursor cursor,
Dali::Image image );
+ void Set
CursorImage(
Dali::Image image );
/**
* @brief Retrieves the image for a cursor.
*
* @return The cursor image.
*/
/**
* @brief Retrieves the image for a cursor.
*
* @return The cursor image.
*/
- Dali::Image Get
Image( Cursor cursor
) const;
+ Dali::Image Get
CursorImage(
) const;
/**
* @brief Sets the color for a cursor.
*
/**
* @brief Sets the color for a cursor.
*
- * @param[in] cursor
The cursor to set
.
+ * @param[in] cursor
Whether this color is for the primary or secondary cursor
.
* @param[in] color The color to use.
*/
void SetColor( Cursor cursor, const Dali::Vector4& color );
* @param[in] color The color to use.
*/
void SetColor( Cursor cursor, const Dali::Vector4& color );
@@
-142,6
+144,7
@@
public:
/**
* @brief Retrieves the color for a cursor.
*
/**
* @brief Retrieves the color for a cursor.
*
+ * @param[in] cursor Whether this color is for the primary or secondary cursor.
* @return The cursor color.
*/
const Dali::Vector4& GetColor( Cursor cursor ) const;
* @return The cursor color.
*/
const Dali::Vector4& GetColor( Cursor cursor ) const;
@@
-197,7
+200,7
@@
private:
* @brief Private constructor.
* @param[in] parent Decorations will be added to this parent control.
*/
* @brief Private constructor.
* @param[in] parent Decorations will be added to this parent control.
*/
- Decorator(
ControlImp
l& parent);
+ Decorator(
Internal::Contro
l& parent);
// Undefined
Decorator( const Decorator& handle );
// Undefined
Decorator( const Decorator& handle );