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
d435c86
..
5f5be4b
100644
(file)
--- a/
dali-toolkit/internal/text/clipping/text-clipper.h
+++ b/
dali-toolkit/internal/text/clipping/text-clipper.h
@@
-20,12
+20,10
@@
// EXTERNAL INCLUDES
#include <dali/public-api/actors/layer.h>
// EXTERNAL INCLUDES
#include <dali/public-api/actors/layer.h>
-#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/actors/camera-actor.h>
-#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/public-api/math/vector2.h>
-#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/render-tasks/render-task.h>
#include <dali/public-api/render-tasks/render-task.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali/public-api/signals/connection-tracker.h>
namespace Dali
{
namespace Dali
{
@@
-42,7
+40,7
@@
typedef IntrusivePtr<Clipper> ClipperPtr;
/**
* @brief A helper class for clipping actors using a FrameBufferImage.
*/
/**
* @brief A helper class for clipping actors using a FrameBufferImage.
*/
-class Clipper : public RefObject
+class Clipper : public RefObject
, public ConnectionTracker
{
public:
{
public:
@@
-56,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;
@@
-64,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
.
*/
*/
-
ImageActor GetImageActor
() const;
+
Actor GetImageView
() const;
/**
* @brief Refresh the contents of the FrameBufferImage.
/**
* @brief Refresh the contents of the FrameBufferImage.
@@
-85,6
+83,13
@@
private: // Implementation
void Initialize( const Vector2& size );
/**
void Initialize( const Vector2& size );
/**
+ * The renderer is not created until the clipper actor is set on stage, only by then the blend function could be set.
+ *
+ * @param[in] actor The actor connected to stage.
+ */
+ void OnStageConnect( Dali::Actor actor );
+
+ /**
* Construct a new Clipper.
*/
Clipper();
* Construct a new Clipper.
*/
Clipper();
@@
-104,7
+109,7
@@
private: // Data
Layer mOffscreenRootActor;
CameraActor mOffscreenCameraActor;
Layer mOffscreenRootActor;
CameraActor mOffscreenCameraActor;
- Image
Actor mImageActor
;
+ Image
View mImageView
;
RenderTask mRenderTask;
Vector2 mCurrentOffscreenSize;
};
RenderTask mRenderTask;
Vector2 mCurrentOffscreenSize;
};