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
[3.0] Text - Fix for placement actor.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
vector-based
/
vector-based-renderer.cpp
diff --git
a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
index
b183524
..
7f15b72
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
+++ b/
dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp
@@
-181,7
+181,9
@@
Text::RendererPtr VectorBasedRenderer::New()
return Text::RendererPtr( new VectorBasedRenderer() );
}
return Text::RendererPtr( new VectorBasedRenderer() );
}
-Actor VectorBasedRenderer::Render( Text::ViewInterface& view, int /*depth*/ )
+Actor VectorBasedRenderer::Render( Text::ViewInterface& view,
+ float& alignmentOffset,
+ int /*depth*/ )
{
UnparentAndReset( mImpl->mActor );
{
UnparentAndReset( mImpl->mActor );
@@
-205,8
+207,10
@@
Actor VectorBasedRenderer::Render( Text::ViewInterface& view, int /*depth*/ )
numberOfGlyphs = view.GetGlyphs( glyphs.Begin(),
positions.Begin(),
numberOfGlyphs = view.GetGlyphs( glyphs.Begin(),
positions.Begin(),
+ alignmentOffset,
0u,
numberOfGlyphs );
0u,
numberOfGlyphs );
+
glyphs.Resize( numberOfGlyphs );
positions.Resize( numberOfGlyphs );
glyphs.Resize( numberOfGlyphs );
positions.Resize( numberOfGlyphs );
@@
-218,7
+222,7
@@
Actor VectorBasedRenderer::Render( Text::ViewInterface& view, int /*depth*/ )
Vector< unsigned short > indices;
const Vector2& controlSize = view.GetControlSize();
Vector< unsigned short > indices;
const Vector2& controlSize = view.GetControlSize();
- float xOffset =
controlSize.width
* -0.5f;
+ float xOffset =
-alignmentOffset + controlSize.width
* -0.5f;
float yOffset = controlSize.height * -0.5f;
if( ! mImpl->mAtlas ||
float yOffset = controlSize.height * -0.5f;
if( ! mImpl->mAtlas ||