X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Layout.cpp;h=b521976d34ba2e6d336d6664b156e7fe5fe9f0db;hp=50090ee6123f2724b9dd33ff2ec64513bcff4104;hb=6c456bd91c102985503b651e4734c5d82221c941;hpb=eac074bfe3a3c144f55583135515d2c8d16eb479 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 50090ee..b521976 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -157,6 +157,7 @@ bool LayoutTextTest( const LayoutTextData& data ) engine.SetLayout( data.layout ); const Length totalNumberOfGlyphs = visualModel->mGlyphs.Count(); + float outlineWidth = visualModel->GetOutlineWidth(); Layout::Parameters layoutParameters( data.textArea, logicalModel->mText.Begin(), @@ -170,7 +171,8 @@ bool LayoutTextTest( const LayoutTextData& data ) visualModel->mGlyphsPerCharacter.Begin(), totalNumberOfGlyphs, Text::HorizontalAlignment::BEGIN, - Layout::LineWrap::WORD ); + Text::LineWrap::WORD, + outlineWidth ); layoutParameters.isLastNewParagraph = isLastNewParagraph; @@ -374,6 +376,7 @@ bool ReLayoutRightToLeftLinesTest( const ReLayoutRightToLeftLinesData& data ) Layout::Engine engine; engine.SetMetrics( metrics ); + float outlineWidth = visualModel->GetOutlineWidth(); Layout::Parameters layoutParameters( data.textArea, logicalModel->mText.Begin(), logicalModel->mLineBreakInfo.Begin(), @@ -386,7 +389,8 @@ bool ReLayoutRightToLeftLinesTest( const ReLayoutRightToLeftLinesData& data ) visualModel->mGlyphsPerCharacter.Begin(), visualModel->mGlyphs.Count(), Text::HorizontalAlignment::BEGIN, - Layout::LineWrap::WORD ); + Text::LineWrap::WORD, + outlineWidth ); layoutParameters.numberOfBidirectionalInfoRuns = logicalModel->mBidirectionalLineInfo.Count(); layoutParameters.lineBidirectionalInfoRunsBuffer = logicalModel->mBidirectionalLineInfo.Begin();