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.9] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
layouts
/
layout-engine.cpp
diff --git
a/dali-toolkit/internal/text/layouts/layout-engine.cpp
b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index
54a957c
..
ad513a8
100644
(file)
--- a/
dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/
dali-toolkit/internal/text/layouts/layout-engine.cpp
@@
-766,10
+766,12
@@
struct LayoutEngine::Impl
{
if( isLastLine && !isRTL )
{
{
if( isLastLine && !isRTL )
{
+ // Add the length of the white saces at the end of the line.
lineLength += line.extraLength;
if( lineLength > boxWidth )
{
lineLength += line.extraLength;
if( lineLength > boxWidth )
{
- lineLength = boxWidth;
+ // The line's length is longer than the box's width.
+ // Set the line's offset to 0 and nothing else to do.
line.alignmentOffset = 0.f;
break;
}
line.alignmentOffset = 0.f;
break;
}