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 skeleton TextController
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.h
diff --git
a/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
b/base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index
53bddf2
..
b3ecd0e
100644
(file)
--- a/
base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
base/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-21,6
+21,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/public-api/text/text-controller.h>
namespace Dali
{
namespace Dali
{
@@
-83,6
+84,12
@@
private: // From Control
private: // Implementation
/**
private: // Implementation
/**
+ * Helper for SetProperty.
+ * @param[in] text The new "text" property value.
+ */
+ void SetText( const std::string& text );
+
+ /**
* Construct a new TextLabel.
*/
TextLabel();
* Construct a new TextLabel.
*/
TextLabel();
@@
-100,9
+107,8
@@
private:
private: // Data
private: // Data
- // TODO - Use Controller/Model for storage
+ Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::RendererPtr mRenderer;
- std::string mText;
};
} // namespace Internal
};
} // namespace Internal