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
[dali_1.3.13] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
text-atlas-renderer.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
index
e259621
..
f114b02
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
@@
-20,7
+20,6
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
-#include <dali-toolkit/internal/text/text-definitions.h>
namespace Dali
{
namespace Dali
{
@@
-45,12
+44,13
@@
public:
static RendererPtr New();
/**
static RendererPtr New();
/**
- * @brief Render the glyphs from a ViewInterface.
- *
- * @param[in] view The interface to a view.
- * @return The Renderable actor used to position the text.
+ * @copydoc Renderer::Render()
*/
*/
- virtual RenderableActor Render( ViewInterface& view );
+ virtual Actor Render( ViewInterface& view,
+ Actor textControl,
+ Property::Index animatablePropertyIndex,
+ float& alignmentOffset,
+ int depth );
protected:
protected: