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 "Add descriptions and example codes" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
clipping
/
text-clipper.h
diff --git
a/dali-toolkit/internal/text/clipping/text-clipper.h
b/dali-toolkit/internal/text/clipping/text-clipper.h
index
a05855c
..
5f5be4b
100644
(file)
--- a/
dali-toolkit/internal/text/clipping/text-clipper.h
+++ b/
dali-toolkit/internal/text/clipping/text-clipper.h
@@
-54,7
+54,7
@@
public:
/**
* @brief Children added to this actor will be clipped with the specified region.
*
/**
* @brief Children added to this actor will be clipped with the specified region.
*
- * @note This is done by rendering to a FrameBufferImage which must then be displayed; see also GetImage
Actor
().
+ * @note This is done by rendering to a FrameBufferImage which must then be displayed; see also GetImage
View
().
* @return The root actor.
*/
Actor GetRootActor() const;
* @return The root actor.
*/
Actor GetRootActor() const;
@@
-62,9
+62,9
@@
public:
/**
* @brief This actor will display the resulting FrameBufferImage.
*
/**
* @brief This actor will display the resulting FrameBufferImage.
*
- * @return The image
actor
.
+ * @return The image
view
.
*/
*/
- Actor GetImage
Actor
() const;
+ Actor GetImage
View
() const;
/**
* @brief Refresh the contents of the FrameBufferImage.
/**
* @brief Refresh the contents of the FrameBufferImage.
@@
-109,7
+109,7
@@
private: // Data
Layer mOffscreenRootActor;
CameraActor mOffscreenCameraActor;
Layer mOffscreenRootActor;
CameraActor mOffscreenCameraActor;
- ImageView mImage
Actor
;
+ ImageView mImage
View
;
RenderTask mRenderTask;
Vector2 mCurrentOffscreenSize;
};
RenderTask mRenderTask;
Vector2 mCurrentOffscreenSize;
};