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.1.29] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
clipping
/
text-clipper.cpp
diff --git
a/dali-toolkit/internal/text/clipping/text-clipper.cpp
b/dali-toolkit/internal/text/clipping/text-clipper.cpp
index
416fdba
..
c4d9a87
100644
(file)
--- a/
dali-toolkit/internal/text/clipping/text-clipper.cpp
+++ b/
dali-toolkit/internal/text/clipping/text-clipper.cpp
@@
-19,10
+19,9
@@
#include <dali-toolkit/internal/text/clipping/text-clipper.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/internal/text/clipping/text-clipper.h>
// EXTERNAL INCLUDES
-#include <algorithm>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/
integration-api/debug
.h>
+#include <dali/
devel-api/rendering/renderer
.h>
namespace
{
namespace
{
@@
-57,7
+56,7
@@
Actor Clipper::GetRootActor() const
return mOffscreenRootActor;
}
return mOffscreenRootActor;
}
-
Image
Actor Clipper::GetImageActor() const
+Actor Clipper::GetImageActor() const
{
return mImageActor;
}
{
return mImageActor;
}
@@
-78,11
+77,14
@@
void Clipper::Refresh( const Vector2& size )
FrameBufferImage frameBufferImage = FrameBufferImage::New( offscreenSize.width,
offscreenSize.height,
Pixel::RGBA8888 );
FrameBufferImage frameBufferImage = FrameBufferImage::New( offscreenSize.width,
offscreenSize.height,
Pixel::RGBA8888 );
+
+ mOffscreenRootActor.SetSize( size );
+
mImageActor.SetSize( offscreenSize );
mImageActor.SetImage( frameBufferImage );
mRenderTask.SetTargetFrameBuffer( frameBufferImage );
mImageActor.SetSize( offscreenSize );
mImageActor.SetImage( frameBufferImage );
mRenderTask.SetTargetFrameBuffer( frameBufferImage );
- // Stores current size to avoid create new Dali resources if text changes.
+ // Stores current siz
P
e to avoid create new Dali resources if text changes.
mCurrentOffscreenSize = offscreenSize;
}
mCurrentOffscreenSize = offscreenSize;
}
@@
-97,16
+99,13
@@
void Clipper::Initialize( const Vector2& size )
// Create a root actor and an image actor for offscreen rendering.
mOffscreenRootActor = Layer::New();
mOffscreenRootActor.SetColorMode( USE_OWN_COLOR );
// Create a root actor and an image actor for offscreen rendering.
mOffscreenRootActor = Layer::New();
mOffscreenRootActor.SetColorMode( USE_OWN_COLOR );
- mOffscreenRootActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION );
- mOffscreenRootActor.SetInheritRotation( false );
+ mOffscreenRootActor.SetInheritPosition( false );
mOffscreenRootActor.SetInheritScale( false );
mOffscreenRootActor.SetDepthTestDisabled( true );
mOffscreenRootActor.SetSize( offscreenSize );
mOffscreenRootActor.SetInheritScale( false );
mOffscreenRootActor.SetDepthTestDisabled( true );
mOffscreenRootActor.SetSize( offscreenSize );
- mImageActor = Image
Actor
::New();
+ mImageActor = Image
View
::New();
mImageActor.SetParentOrigin( ParentOrigin::CENTER );
mImageActor.SetParentOrigin( ParentOrigin::CENTER );
- mImageActor.SetBlendFunc( BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA,
- BlendingFactor::ONE, BlendingFactor::ONE );
mImageActor.SetScale( Vector3( 1.0f, -1.0f, 1.0f ) );
mImageActor.SetSize( offscreenSize );
mImageActor.SetScale( Vector3( 1.0f, -1.0f, 1.0f ) );
mImageActor.SetSize( offscreenSize );
@@
-130,11
+129,19
@@
void Clipper::Initialize( const Vector2& size )
Pixel::RGBA8888 );
mImageActor.SetImage( frameBufferImage );
mRenderTask.SetTargetFrameBuffer( frameBufferImage );
Pixel::RGBA8888 );
mImageActor.SetImage( frameBufferImage );
mRenderTask.SetTargetFrameBuffer( frameBufferImage );
+ mImageActor.OnStageSignal().Connect(this, &Clipper::OnStageConnect);
// Stores current size to avoid create new Dali resources if text changes.
mCurrentOffscreenSize = offscreenSize;
}
// Stores current size to avoid create new Dali resources if text changes.
mCurrentOffscreenSize = offscreenSize;
}
+void Clipper::OnStageConnect( Dali::Actor actor )
+{
+ Renderer renderer = mImageActor.GetRendererAt(0);
+ renderer.SetBlendFunc(BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA,
+ BlendingFactor::ONE, BlendingFactor::ONE);
+}
+
Clipper::Clipper()
{
}
Clipper::Clipper()
{
}