From 501c071e01ff5f3cb0805c717b2aa5b3f6f0f52d Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Tue, 13 Nov 2018 15:25:33 +0900 Subject: [PATCH] Revert "[Tizen] bug fixed : Characters are truncated when HorizontalAlignment.End in" This reverts commit 625f0a13d1ca8942a4c98de531afec3856ead95a. --- .../src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp | 2 +- dali-toolkit/internal/text/layouts/layout-engine.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp index 5b67476..bc9d08b 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp @@ -5316,7 +5316,7 @@ int UtcDaliTextAlign10(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; + float positions[] = { -4.f, 0.f, 0.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index 7b29200..0c3d9df 100755 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -1150,8 +1150,7 @@ struct Engine::Impl bool matchSystemLanguageDirection ) { line.alignmentOffset = 0.f; - bool isLineRTL = RTL == line.direction; - bool isRTL = isLineRTL; + bool isRTL = RTL == line.direction; float lineLength = line.width; HorizontalAlignment::Type alignment = horizontalAlignment; @@ -1192,7 +1191,7 @@ struct Engine::Impl { line.alignmentOffset = 0.f; - if( isLineRTL ) + if( isRTL ) { // 'Remove' the white spaces at the end of the line (which are at the beginning in visual order) line.alignmentOffset -= line.extraLength; @@ -1203,7 +1202,7 @@ struct Engine::Impl { line.alignmentOffset = 0.5f * ( boxWidth - lineLength ); - if( isLineRTL ) + if( isRTL ) { line.alignmentOffset -= line.extraLength; } @@ -1213,7 +1212,7 @@ struct Engine::Impl } case HorizontalAlignment::END: { - if( isLineRTL ) + if( isRTL ) { lineLength += line.extraLength; } -- 2.7.4