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 doing unparent and reset in text decorator." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
text-renderer.h
diff --git
a/dali-toolkit/internal/text/rendering/text-renderer.h
b/dali-toolkit/internal/text/rendering/text-renderer.h
index
3485f16
..
17be8d8
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/text-renderer.h
+++ b/
dali-toolkit/internal/text/rendering/text-renderer.h
@@
-19,7
+19,7
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/
renderable-
actor.h>
+#include <dali/public-api/actors/actor.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/object/ref-object.h>
@@
-52,9
+52,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
) = 0;
+ virtual
Actor Render( ViewInterface& view, int depth
) = 0;
protected:
protected: