From f0a1fb9982926ad4d3650637abbc50d4b1439b0b Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Tue, 31 Mar 2020 10:30:13 +0900 Subject: [PATCH] fixed align problems when whitespaces are included TextLabel ellipsisTest = TextLabel::New( "abcde abced "); ellipsisTest.SetAnchorPoint( AnchorPoint::TOP_LEFT ); ellipsisTest.SetProperty(TextLabel::Property::POINT_SIZE, 34.f); ellipsisTest.SetPosition(100.f, 600.f); ellipsisTest.SetSize( 344.f, 100.f); ellipsisTest.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER"); stage.Add( ellipsisTest ); Change-Id: I1641df673a9407e085da8645737f292d73fc8f0f --- .../internal/text/layouts/layout-engine.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index f4ec162..e91ebae 100755 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -923,24 +923,9 @@ struct Engine::Impl lineRun.characterRun.numberOfCharacters = layout.numberOfCharacters; lineRun.lineSpacing = mDefaultLineSpacing; - if( isLastLine && !layoutParameters.isLastNewParagraph ) - { - lineRun.width = layout.length; - if( LTR == layout.direction ) - { - lineRun.width += layout.whiteSpaceLengthEndOfLine; - lineRun.extraLength = 0.f; - } - else - { - lineRun.extraLength = layout.whiteSpaceLengthEndOfLine; - } - } - else - { - lineRun.width = layout.length; - lineRun.extraLength = std::ceil( layout.whiteSpaceLengthEndOfLine ); - } + lineRun.width = layout.length; + lineRun.extraLength = std::ceil( layout.whiteSpaceLengthEndOfLine ); + // Rounds upward to avoid a non integer size. lineRun.width = std::ceil( lineRun.width ); -- 2.7.4