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 "Stop setting crazy Z value with controls (at the moment depth is ignored by...
[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
..
a6ae4b6
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
{
@@
-48,9
+47,10
@@
public:
* @brief Render the glyphs from a ViewInterface.
*
* @param[in] view The interface to a view.
* @brief Render the glyphs from a ViewInterface.
*
* @param[in] view The interface to a view.
+ * @param[in] depth The depth in the tree of the parent.
* @return The Renderable actor used to position the text.
*/
* @return The Renderable actor used to position the text.
*/
- virtual
RenderableActor Render( ViewInterface& view
);
+ virtual
Actor Render( ViewInterface& view, int depth
);
protected:
protected: