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=05226d4f49b4621f325a6fb901c08e63afd281f3;hp=d84943066b2821415e4543a1705b8093b4baf8af;hb=610495b8647d1a25c98bf0773ccc0dd6d1996263;hpb=5253e9e87aa853a60b624b1a342a19ebca26f7a4 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 old mode 100644 new mode 100755 index d849430..05226d4 --- 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) 2019 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. @@ -24,7 +24,7 @@ #include #include #include -#include +#include using namespace Dali; using namespace Toolkit; @@ -51,7 +51,7 @@ struct LayoutTextData float* positions; unsigned int numberOfLines; LineRun* lines; - LayoutEngine::Layout layout; + Layout::Engine::Type layout; unsigned int startIndex; unsigned int numberOfGlyphs; bool ellipsis:1; @@ -62,7 +62,7 @@ void Print( const LineRun& line ) { std::cout << " glyph run, index : " << line.glyphRun.glyphIndex << ", num glyphs : " << line.glyphRun.numberOfGlyphs << std::endl; std::cout << " character run, index : " << line.characterRun.characterIndex << ", num chars : " << line.characterRun.numberOfCharacters << std::endl; - std::cout << " width : " << line.width << std::endl; + std::cout << " width : " << floor(line.width) << std::endl; std::cout << " ascender : " << line.ascender << std::endl; std::cout << " descender : " << line.descender << std::endl; std::cout << " extraLength : " << line.extraLength << std::endl; @@ -84,10 +84,11 @@ bool LayoutTextTest( const LayoutTextData& data ) fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" ); fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" ); fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf" ); + fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHindiRegular.ttf" ); // 1) Create the model. - LogicalModelPtr logicalModel = LogicalModel::New(); - VisualModelPtr visualModel = VisualModel::New(); + ModelPtr textModel; + MetricsPtr metrics; Size layoutSize; Vector fontDescriptionRuns; @@ -99,15 +100,18 @@ bool LayoutTextTest( const LayoutTextData& data ) } LayoutOptions options; - options.reorder = false; options.align = false; CreateTextModel( data.text, data.textArea, fontDescriptionRuns, options, layoutSize, - logicalModel, - visualModel ); + textModel, + metrics, + false ); + + LogicalModelPtr logicalModel = textModel->mLogicalModel; + VisualModelPtr visualModel = textModel->mVisualModel; // 2) Clear the layout. Vector& lines = visualModel->mLines; @@ -150,26 +154,16 @@ bool LayoutTextTest( const LayoutTextData& data ) glyphPositions.Begin() + data.startIndex + data.numberOfGlyphs ); // 3) Layout - MetricsPtr metrics = Metrics::New( fontClient ); - - LayoutEngine engine; + Layout::Engine engine; engine.SetMetrics( metrics ); - engine.SetTextEllipsisEnabled( data.ellipsis ); engine.SetLayout( data.layout ); - const Length totalNumberOfGlyphs = visualModel->mGlyphs.Count(); - - LayoutParameters layoutParameters( data.textArea, - logicalModel->mText.Begin(), - logicalModel->mLineBreakInfo.Begin(), - logicalModel->mWordBreakInfo.Begin(), - ( 0u != logicalModel->mCharacterDirections.Count() ) ? logicalModel->mCharacterDirections.Begin() : NULL, - visualModel->mGlyphs.Begin(), - visualModel->mGlyphsToCharacters.Begin(), - visualModel->mCharactersPerGlyph.Begin(), - visualModel->mCharactersToGlyph.Begin(), - visualModel->mGlyphsPerCharacter.Begin(), - totalNumberOfGlyphs ); + textModel->mHorizontalAlignment = Text::HorizontalAlignment::BEGIN; + textModel->mLineWrapMode = LineWrap::WORD; + textModel->mIgnoreSpacesAfterText = true; + textModel->mMatchSystemLanguageDirection = false; + Layout::Parameters layoutParameters( data.textArea, + textModel ); layoutParameters.isLastNewParagraph = isLastNewParagraph; @@ -177,13 +171,15 @@ bool LayoutTextTest( const LayoutTextData& data ) layoutParameters.startGlyphIndex = data.startIndex; layoutParameters.numberOfGlyphs = data.numberOfGlyphs; layoutParameters.startLineIndex = startRemoveIndex; + layoutParameters.estimatedNumberOfLines = logicalModel->mParagraphInfo.Count(); layoutSize = Vector2::ZERO; + bool isAutoScroll = false; const bool updated = engine.LayoutText( layoutParameters, - glyphPositions, - lines, - layoutSize ); + layoutSize, + data.ellipsis, + isAutoScroll ); // 4) Compare the results. @@ -203,7 +199,7 @@ bool LayoutTextTest( const LayoutTextData& data ) { const Vector2& position = *( glyphPositions.Begin() + index ); - if( fabsf( position.x - *( data.positions + 2u * index ) ) > Math::MACHINE_EPSILON_1000 ) + if( fabsf( std::round( position.x ) - *( data.positions + 2u * index ) ) > Math::MACHINE_EPSILON_1000 ) { std::cout << " Different position for glyph " << index << " x : " << position.x << ", expected : " << *( data.positions + 2u * index ) << std::endl; return false; @@ -260,7 +256,7 @@ bool LayoutTextTest( const LayoutTextData& data ) return false; } - if( fabsf( line.width - expectedLine.width ) > Math::MACHINE_EPSILON_1 ) + if( fabsf( floor( line.width ) - expectedLine.width ) > Math::MACHINE_EPSILON_1 ) { std::cout << " Different line info for line : " << index << std::endl; Print( line ); @@ -314,113 +310,6 @@ bool LayoutTextTest( const LayoutTextData& data ) ////////////////////////////////////////////////////////// -struct ReLayoutRightToLeftLinesData -{ - std::string description; - std::string text; - Size textArea; - unsigned int numberOfFonts; - FontDescriptionRun* fontDescriptions; - unsigned int totalNumberOfGlyphs; - float* positions; - unsigned int startIndex; - unsigned int numberOfCharacters; -}; - -bool ReLayoutRightToLeftLinesTest( const ReLayoutRightToLeftLinesData& data ) -{ - // Load some fonts. - TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); - fontClient.SetDpi( 96u, 96u ); - - char* pathNamePtr = get_current_dir_name(); - const std::string pathName( pathNamePtr ); - free( pathNamePtr ); - - fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" ); - fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansHebrewRegular.ttf" ); - fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf" ); - - // 1) Create the model. - LogicalModelPtr logicalModel = LogicalModel::New(); - VisualModelPtr visualModel = VisualModel::New(); - Size layoutSize; - - Vector fontDescriptionRuns; - if( 0u != data.numberOfFonts ) - { - fontDescriptionRuns.Insert( fontDescriptionRuns.End(), - data.fontDescriptions, - data.fontDescriptions + data.numberOfFonts ); - } - - LayoutOptions options; - options.reorder = false; - options.align = false; - CreateTextModel( data.text, - data.textArea, - fontDescriptionRuns, - options, - layoutSize, - logicalModel, - visualModel ); - - // 2) Call the ReLayoutRightToLeftLines() method. - MetricsPtr metrics = Metrics::New( fontClient ); - - LayoutEngine engine; - engine.SetMetrics( metrics ); - - LayoutParameters layoutParameters( data.textArea, - logicalModel->mText.Begin(), - logicalModel->mLineBreakInfo.Begin(), - logicalModel->mWordBreakInfo.Begin(), - ( 0u != logicalModel->mCharacterDirections.Count() ) ? logicalModel->mCharacterDirections.Begin() : NULL, - visualModel->mGlyphs.Begin(), - visualModel->mGlyphsToCharacters.Begin(), - visualModel->mCharactersPerGlyph.Begin(), - visualModel->mCharactersToGlyph.Begin(), - visualModel->mGlyphsPerCharacter.Begin(), - visualModel->mGlyphs.Count() ); - - layoutParameters.numberOfBidirectionalInfoRuns = logicalModel->mBidirectionalLineInfo.Count(); - layoutParameters.lineBidirectionalInfoRunsBuffer = logicalModel->mBidirectionalLineInfo.Begin(); - - engine.ReLayoutRightToLeftLines( layoutParameters, - data.startIndex, - data.numberOfCharacters, - visualModel->mGlyphPositions ); - - // 3) Compare the results. - Vector& glyphPositions = visualModel->mGlyphPositions; - - if( data.totalNumberOfGlyphs != visualModel->mGlyphs.Count() ) - { - std::cout << " Different number of glyphs : " << visualModel->mGlyphs.Count() << ", expected : " << data.totalNumberOfGlyphs << std::endl; - return false; - } - - for( unsigned int index = 0u; index < data.totalNumberOfGlyphs; ++index ) - { - const Vector2& position = *( glyphPositions.Begin() + index ); - - if( fabsf( position.x - *( data.positions + 2u * index ) ) > Math::MACHINE_EPSILON_1000 ) - { - std::cout << " Different position for glyph " << index << " x : " << position.x << ", expected : " << *( data.positions + 2u * index ) << std::endl; - return false; - } - if( fabsf( position.y - *( data.positions + 2u * index + 1u ) ) > Math::MACHINE_EPSILON_1000 ) - { - std::cout << " Different position for glyph " << index << " y : " << position.y << ", expected : " << *( data.positions + 2u * index + 1u ) << std::endl; - return false; - } - } - - return true; -} - -////////////////////////////////////////////////////////// - struct AlignData { std::string description; @@ -428,12 +317,14 @@ struct AlignData Size textArea; unsigned int numberOfFonts; FontDescriptionRun* fontDescriptions; - LayoutEngine::HorizontalAlignment horizontalAlignment; - LayoutEngine::VerticalAlignment verticalAlignment; + Text::HorizontalAlignment::Type horizontalAlignment; + Text::VerticalAlignment::Type verticalAlignment; unsigned int startIndex; unsigned int numberOfCharacters; unsigned int numberOfLines; float* lineOffsets; + Dali::LayoutDirection::Type layoutDirection; + bool matchSystemLanguageDirection; }; bool AlignTest( const AlignData& data ) @@ -451,8 +342,8 @@ bool AlignTest( const AlignData& data ) fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansArabicRegular.ttf" ); // 1) Create the model. - LogicalModelPtr logicalModel = LogicalModel::New(); - VisualModelPtr visualModel = VisualModel::New(); + ModelPtr textModel; + MetricsPtr metrics; Size layoutSize; Vector fontDescriptionRuns; @@ -470,22 +361,26 @@ bool AlignTest( const AlignData& data ) fontDescriptionRuns, options, layoutSize, - logicalModel, - visualModel ); + textModel, + metrics, + false ); - // Call the Align method. - MetricsPtr metrics = Metrics::New( fontClient ); + LogicalModelPtr logicalModel = textModel->mLogicalModel; + VisualModelPtr visualModel = textModel->mVisualModel; - LayoutEngine engine; + // Call the Align method. + Layout::Engine engine; engine.SetMetrics( metrics ); - engine.SetHorizontalAlignment( data.horizontalAlignment ); - engine.SetVerticalAlignment( data.verticalAlignment ); - + float alignmentOffset = 0.f; engine.Align( data.textArea, data.startIndex, data.numberOfCharacters, - visualModel->mLines ); + data.horizontalAlignment, + visualModel->mLines, + alignmentOffset, + data.layoutDirection, + data.matchSystemLanguageDirection ); // Compare results. if( data.numberOfLines != visualModel->mLines.Count() ) @@ -505,7 +400,6 @@ bool AlignTest( const AlignData& data ) return false; } } - return true; } @@ -526,6 +420,7 @@ bool AlignTest( const AlignData& data ) // UtcDaliTextLayoutMultilineText03 // UtcDaliTextLayoutMultilineText04 // UtcDaliTextLayoutMultilineText05 +// UtcDaliTextLayoutMultilineText06 // UtcDaliTextUpdateLayout01 // UtcDaliTextUpdateLayout02 // UtcDaliTextUpdateLayout03 @@ -555,61 +450,12 @@ int UtcDaliTextLayoutSetGetLayout(void) ToolkitTestApplication application; tet_infoline(" UtcDaliTextLayoutSetGetLayout"); - LayoutEngine engine; + Layout::Engine engine; - DALI_TEST_CHECK( LayoutEngine::SINGLE_LINE_BOX == engine.GetLayout() ); - - engine.SetLayout( LayoutEngine::MULTI_LINE_BOX ); - DALI_TEST_CHECK( LayoutEngine::MULTI_LINE_BOX == engine.GetLayout() ); - - tet_result(TET_PASS); - END_TEST; -} - -int UtcDaliTextLayoutSetGetTextEllipsisEnabled(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliTextLayoutSetGetTextEllipsisEnabled"); - - LayoutEngine engine; - - DALI_TEST_CHECK( !engine.GetTextEllipsisEnabled() ); - - engine.SetTextEllipsisEnabled( true ); - DALI_TEST_CHECK( engine.GetTextEllipsisEnabled() ); - - tet_result(TET_PASS); - END_TEST; -} - -int UtcDaliTextLayoutSetGetHorizontalAlignment(void) -{ - ToolkitTestApplication application; - tet_infoline(" "); - - LayoutEngine engine; - - DALI_TEST_CHECK( LayoutEngine::HORIZONTAL_ALIGN_BEGIN == engine.GetHorizontalAlignment() ); - - engine.SetHorizontalAlignment( LayoutEngine::HORIZONTAL_ALIGN_END ); - DALI_TEST_CHECK( LayoutEngine::HORIZONTAL_ALIGN_END == engine.GetHorizontalAlignment() ); - - tet_result(TET_PASS); - END_TEST; -} - -int UtcDaliTextLayoutSetGetVerticalAlignment(void) -{ - ToolkitTestApplication application; - tet_infoline(" UtcDaliTextLayoutSetGetVerticalAlignment"); - - LayoutEngine engine; - - DALI_TEST_CHECK( LayoutEngine::VERTICAL_ALIGN_TOP == engine.GetVerticalAlignment() ); - - engine.SetVerticalAlignment( LayoutEngine::VERTICAL_ALIGN_TOP ); - DALI_TEST_CHECK( LayoutEngine::VERTICAL_ALIGN_TOP == engine.GetVerticalAlignment() ); + DALI_TEST_CHECK( Layout::Engine::SINGLE_LINE_BOX == engine.GetLayout() ); + engine.SetLayout( Layout::Engine::MULTI_LINE_BOX ); + DALI_TEST_CHECK( Layout::Engine::MULTI_LINE_BOX == engine.GetLayout() ); tet_result(TET_PASS); END_TEST; @@ -620,9 +466,9 @@ int UtcDaliTextLayoutSetGetCursorWidth(void) ToolkitTestApplication application; tet_infoline(" "); - LayoutEngine engine; + Layout::Engine engine; - DALI_TEST_EQUALS( 1, engine.GetCursorWidth(), TEST_LOCATION ); + DALI_TEST_EQUALS( 0, engine.GetCursorWidth(), TEST_LOCATION ); engine.SetCursorWidth( 2 ); DALI_TEST_EQUALS( 2, engine.GetCursorWidth(), TEST_LOCATION ); @@ -650,7 +496,7 @@ int UtcDaliTextLayoutNoText(void) NULL, 0u, NULL, - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 0u, false, @@ -704,7 +550,7 @@ int UtcDaliTextLayoutSmallTextArea01(void) NULL, 0u, NULL, - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 11u, false, @@ -745,15 +591,16 @@ int UtcDaliTextLayoutSmallTextArea02(void) Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun ); Size textArea(1.f, 1.f); - Size layoutSize(80.f, 20.f); - float positions[] = { 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f }; + Size layoutSize(81.f, 19.f); + float positions[] = { 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f }; struct LineRun line = { { 0u, 11u }, { 0u, 11u }, - 80.f, + 81.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -774,7 +621,7 @@ int UtcDaliTextLayoutSmallTextArea02(void) positions, 1u, lines.Begin(), - LayoutEngine::SINGLE_LINE_BOX, + Layout::Engine::SINGLE_LINE_BOX, 0u, 11u, false, @@ -828,14 +675,14 @@ int UtcDaliTextLayoutMultilineText01(void) fontDescriptionRuns.PushBack( fontDescriptionRun1 ); fontDescriptionRuns.PushBack( fontDescriptionRun2 ); Size textArea(100.f, 300.f); - Size layoutSize(95.f, 97.f); + Size layoutSize(97.f, 95.f); float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 15.f, - 0.f, 22.f, 10.f, 26.f, 18.f, 26.f, 30.f, 26.f, 39.f, 32.f, 42.f, 23.f, - 1.f, 43.f, 9.f, 46.f, 17.f, 46.f, 27.f, 46.f, 36.f, 46.f, 45.f, 44.f, 51.f, 55.f, - 1.f, 62.f, 11.f, 62.f, 15.f, 62.f, 26.f, 65.f, 35.f, 65.f, 41.f, 65.f, 50.f, 65.f, 59.f, 63.f, 65.f, 74.f, - 1.f, 81.f, 5.f, 81.f, 9.f, 84.f, 19.f, 84.f, 28.f, 84.f, 35.f, 93.f, 41.f, 84.f, 50.f, 81.f, 54.f, 93.f, 59.f, 82.f, 66.f, 84.f, 75.f, 84.f, 83.f, 82.f, 91.f, 91.f + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -2.f, 45.f, -12.f, + 0.f, -12.f, 9.f, -9.f, 18.f, -9.f, 28.f, -9.f, 38.f, -9.f, 47.f, -11.f, 53.f, -0.f, + 0.f, -12.f, 10.f, -12.f, 15.f, -12.f, 26.f, -9.f, 35.f, -9.f, 42.f, -9.f, 52.f, -9.f, 61.f, -11.f, 67.f, -0.f, + 0.f, -12.f, 4.f, -12.f, 9.f, -9.f, 19.f, -9.f, 29.f, -9.f, 36.f, -0.f, 42.f, -9.f, 52.f, -12.f, 57.f, -0.f, 62.f, -11.f, 69.f, -9.f, 79.f, -9.f, 87.f, -11.f, 95.f, -2.f }; struct LineRun line0 = { @@ -843,8 +690,9 @@ int UtcDaliTextLayoutMultilineText01(void) { 0u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -853,9 +701,10 @@ int UtcDaliTextLayoutMultilineText01(void) { { 12u, 6u }, { 12u, 6u }, - 43.f, + 44.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -865,10 +714,11 @@ int UtcDaliTextLayoutMultilineText01(void) { { 18u, 7u }, { 18u, 7u }, - 52.f, + 53.f, 15.f, -4.f, - 5.f, + 6.f, + 0.f, 0.f, false, false @@ -880,7 +730,8 @@ int UtcDaliTextLayoutMultilineText01(void) 66.f, 15.f, -4.f, - 5.f, + 6.f, + 0.f, 0.f, false, false @@ -889,11 +740,12 @@ int UtcDaliTextLayoutMultilineText01(void) { { 34u, 14u }, { 35u, 14u }, - 95.f, + 97.f, 15.f, -4.f, 0.f, 0.f, + 0.f, false, false }; @@ -917,7 +769,7 @@ int UtcDaliTextLayoutMultilineText01(void) positions, 5u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 48u, false, @@ -960,7 +812,7 @@ int UtcDaliTextLayoutMultilineText02(void) // Set a known font description FontDescriptionRun fontDescriptionRun2; fontDescriptionRun2.characterRun.characterIndex = 17u; - fontDescriptionRun2.characterRun.numberOfCharacters = 11u; + fontDescriptionRun2.characterRun.numberOfCharacters = 9u; fontDescriptionRun2.familyLength = fontFamily2.size(); fontDescriptionRun2.familyName = new char[fontDescriptionRun2.familyLength]; memcpy( fontDescriptionRun2.familyName, fontFamily2.c_str(), fontDescriptionRun2.familyLength ); @@ -970,12 +822,12 @@ int UtcDaliTextLayoutMultilineText02(void) fontDescriptionRun2.slantDefined = false; fontDescriptionRun2.sizeDefined = false; - const std::string fontFamily3( "TizenSansHebrew" ); + const std::string fontFamily3( "TizenSans" ); // Set a known font description FontDescriptionRun fontDescriptionRun3; - fontDescriptionRun3.characterRun.characterIndex = 28u; - fontDescriptionRun3.characterRun.numberOfCharacters = 10u; + fontDescriptionRun3.characterRun.characterIndex = 26u; + fontDescriptionRun3.characterRun.numberOfCharacters = 2u; fontDescriptionRun3.familyLength = fontFamily3.size(); fontDescriptionRun3.familyName = new char[fontDescriptionRun3.familyLength]; memcpy( fontDescriptionRun3.familyName, fontFamily3.c_str(), fontDescriptionRun3.familyLength ); @@ -985,12 +837,12 @@ int UtcDaliTextLayoutMultilineText02(void) fontDescriptionRun3.slantDefined = false; fontDescriptionRun3.sizeDefined = false; - const std::string fontFamily4( "TizenSans" ); + const std::string fontFamily4( "TizenSansHebrew" ); // Set a known font description FontDescriptionRun fontDescriptionRun4; - fontDescriptionRun4.characterRun.characterIndex = 38u; - fontDescriptionRun4.characterRun.numberOfCharacters = 17u; + fontDescriptionRun4.characterRun.characterIndex = 28u; + fontDescriptionRun4.characterRun.numberOfCharacters = 10u; fontDescriptionRun4.familyLength = fontFamily4.size(); fontDescriptionRun4.familyName = new char[fontDescriptionRun4.familyLength]; memcpy( fontDescriptionRun4.familyName, fontFamily4.c_str(), fontDescriptionRun4.familyLength ); @@ -1000,21 +852,37 @@ int UtcDaliTextLayoutMultilineText02(void) fontDescriptionRun4.slantDefined = false; fontDescriptionRun4.sizeDefined = false; + const std::string fontFamily5( "TizenSans" ); + + // Set a known font description + FontDescriptionRun fontDescriptionRun5; + fontDescriptionRun5.characterRun.characterIndex = 38u; + fontDescriptionRun5.characterRun.numberOfCharacters = 17u; + fontDescriptionRun5.familyLength = fontFamily5.size(); + fontDescriptionRun5.familyName = new char[fontDescriptionRun5.familyLength]; + memcpy( fontDescriptionRun5.familyName, fontFamily5.c_str(), fontDescriptionRun5.familyLength ); + fontDescriptionRun5.familyDefined = true; + fontDescriptionRun5.weightDefined = false; + fontDescriptionRun5.widthDefined = false; + fontDescriptionRun5.slantDefined = false; + fontDescriptionRun5.sizeDefined = false; + Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun1 ); fontDescriptionRuns.PushBack( fontDescriptionRun2 ); fontDescriptionRuns.PushBack( fontDescriptionRun3 ); fontDescriptionRuns.PushBack( fontDescriptionRun4 ); + fontDescriptionRuns.PushBack( fontDescriptionRun5 ); Size textArea(100.f, 300.f); - Size layoutSize(81.f, 120.f); + Size layoutSize(81.f, 114.f); float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 15.f, - 0.f, 22.f, 10.f, 26.f, 18.f, 26.f, 30.f, 26.f, 39.f, 35.f, 44.f, 25.f, 55.f, 22.f, 62.f, 25.f, 67.f, 25.f, 75.f, 35.f, - 1.f, 45.f, 9.f, 45.f, 14.f, 42.f, 22.f, 45.f, 32.f, 53.f, 35.f, 44.f, - 1.f, 65.f, 12.f, 62.f, 19.f, 65.f, 24.f, 65.f, 32.f, 75.f, 37.f, 65.f, 45.f, 65.f, 50.f, 62.f, 58.f, 65.f, 66.f, 75.f, - 1.f, 82.f, 10.f, 86.f, 18.f, 82.f, 22.f, 82.f, 25.f, 86.f, 34.f, 95.f, 38.f, 86.f, 49.f, 86.f, 59.f, 86.f, 65.f, 82.f, 68.f, 82.f, 77.f, 95.f, - 0.f, 102.f, 10.f, 106.f, 18.f, 106.f, 30.f, 106.f, 39.f, 112.f + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, // 0 .. 11 + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 69.f, -10.f, 60.f, -13.f, 54.f, -10.f, 46.f, -10.f, 79.f, -0.f, // 12 .. 21 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -2.f, 35.f, -12.f, // 22 .. 27 + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, // 28 .. 37 + 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 38 .. 49 + 4.f, -13.f, 13.f, -9.f, 23.f, -9.f, 36.f, -9.f, 0.f, -2.f, // 50 .. 54 }; struct LineRun line0 = { @@ -1022,8 +890,9 @@ int UtcDaliTextLayoutMultilineText02(void) { 0u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -1032,10 +901,11 @@ int UtcDaliTextLayoutMultilineText02(void) { { 12u, 10u }, { 12u, 10u }, - 76.f, + 79.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -1044,9 +914,10 @@ int UtcDaliTextLayoutMultilineText02(void) { { 22u, 6u }, { 22u, 6u }, - 36.f, + 34.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1056,10 +927,11 @@ int UtcDaliTextLayoutMultilineText02(void) { { 28u, 10u }, { 28u, 10u }, - 67.f, + 69.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -1070,8 +942,9 @@ int UtcDaliTextLayoutMultilineText02(void) { 38u, 12u }, 79.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -1080,9 +953,10 @@ int UtcDaliTextLayoutMultilineText02(void) { { 50u, 5u }, { 50u, 5u }, - 43.f, + 45.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1102,14 +976,14 @@ int UtcDaliTextLayoutMultilineText02(void) "Hello world demo שלום עולם.\n" "שלום עולם hello world demo.", textArea, - 4u, + 5u, fontDescriptionRuns.Begin(), layoutSize, 55u, positions, 6u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 55u, false, @@ -1150,20 +1024,21 @@ int UtcDaliTextLayoutMultilineText03(void) Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun ); Size textArea(100.f, 300.f); - Size layoutSize(96.f, 60.f); + Size layoutSize(98.f, 57.f); float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 6.f, 47.f, 6.f, 57.f, 6.f, 63.f, 2.f, 66.f, 2.f, 75.f, 2.f, 85.f, 6.f, - 1.f, 26.f, 13.f, 26.f, 23.f, 22.f, 32.f, 26.f, 40.f, 22.f, 44.f, 22.f, 47.f, 26.f, 56.f, 26.f, 67.f, 26.f, 77.f, 26.f, 83.f, 22.f, 86.f, 22.f, - 0.f, 42.f, 10.f, 46.f, 18.f, 46.f, 30.f, 46.f, 39.f, 52.f + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -9.f, 48.f, -9.f, 58.f, -9.f, 65.f, -13.f, 68.f, -13.f, 77.f, -13.f, 86.f, -9.f, + 0.f, -9.f, 13.f, -9.f, 23.f, -13.f, 31.f, -9.f, 41.f, -13.f, 45.f, -13.f, 48.f, -9.f, 57.f, -9.f, 69.f, -9.f, 79.f, -9.f, 85.f, -13.f, 88.f, -13.f, + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -2.f, }; struct LineRun line0 = { { 0u, 12u }, { 0u, 12u }, - 94.f, + 95.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1173,9 +1048,10 @@ int UtcDaliTextLayoutMultilineText03(void) { { 12u, 12u }, { 12u, 12u }, - 96.f, + 98.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1185,9 +1061,10 @@ int UtcDaliTextLayoutMultilineText03(void) { { 24u, 5u }, { 24u, 5u }, - 43.f, + 44.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1210,7 +1087,7 @@ int UtcDaliTextLayoutMultilineText03(void) positions, 3u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 29u, false, @@ -1251,18 +1128,18 @@ int UtcDaliTextLayoutMultilineText04(void) Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun ); Size textArea(100.f, 300.f); - Size layoutSize(83.f, 40.f); + Size layoutSize(84.f, 38.f); float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 12.f, 82.f, 3.f + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -2.f, 85.f, -12.f }; struct LineRun line0 = { { 0u, 13u }, { 0u, 13u }, - 83.f, + 84.f, 15.f, - -5.f, + -4.f, 0.f, 0.f, false, @@ -1274,7 +1151,8 @@ int UtcDaliTextLayoutMultilineText04(void) { 13u, 0u }, 0.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1296,7 +1174,7 @@ int UtcDaliTextLayoutMultilineText04(void) positions, 2u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 13u, false, @@ -1364,21 +1242,22 @@ int UtcDaliTextLayoutMultilineText05(void) fontDescriptionRuns.PushBack( fontDescriptionRun2 ); fontDescriptionRuns.PushBack( fontDescriptionRun3 ); Size textArea(100.f, 300.f); - Size layoutSize(88.f, 53.f); + Size layoutSize(89.f, 51.f); float positions[] = { - 1.f, 13.f, 12.f, 16.f, 20.f, 12.f, 24.f, 12.f, 27.f, 16.f, 36.f, 25.f, 40.f, 11.f, 59.f, 16.f, 69.f, 16.f, 75.f, 12.f, 78.f, 12.f, 87.f, 25.f, - 0.f, 35.f, 10.f, 39.f, 18.f, 39.f, 30.f, 39.f, 39.f, 45.f + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -14.f, 60.f, -9.f, 71.f, -9.f, 77.f, -13.f, 80.f, -13.f, 89.f, -0.f, + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -2.f }; struct LineRun line0 = { { 0u, 12u }, { 0u, 12u }, - 88.f, + 89.f, 25.f, - -8.f, + -7.f, 4.f, 0.f, + 0.f, false, false }; @@ -1386,9 +1265,10 @@ int UtcDaliTextLayoutMultilineText05(void) { { 12u, 5u }, { 12u, 5u }, - 43.f, + 44.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1410,7 +1290,7 @@ int UtcDaliTextLayoutMultilineText05(void) positions, 2u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 17u, false, @@ -1426,6 +1306,197 @@ int UtcDaliTextLayoutMultilineText05(void) END_TEST; } +int UtcDaliTextLayoutMultilineText06(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliTextLayoutMultilineText06"); + + const std::string fontFamily( "TizenSansHebrew" ); + + // Set a known font description + FontDescriptionRun fontDescriptionRun; + fontDescriptionRun.characterRun.characterIndex = 0u; + fontDescriptionRun.characterRun.numberOfCharacters = 10u; + fontDescriptionRun.familyLength = fontFamily.size(); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyDefined = true; + fontDescriptionRun.weightDefined = false; + fontDescriptionRun.widthDefined = false; + fontDescriptionRun.slantDefined = false; + fontDescriptionRun.sizeDefined = false; + + Vector fontDescriptionRuns; + fontDescriptionRuns.PushBack( fontDescriptionRun ); + + Size textArea(64.f, 100.f); + Size layoutSize(33.f, 38.f); + float positions[] = + { + 28.f, -13.f, 18.f, -10.f, 9.f, -10.f, 4.f, -10.f, 0.f, -0.f, + 23.f, -10.f, 18.f, -10.f, 12.f, -10.f, 4.f, -10.f, 0.f, -10.f + }; + struct LineRun line0 = + { + { 0u, 5u }, + { 0u, 5u }, + 32.f, + 15.f, + -4.f, + 5.f, + 0.f, + 0.f, + true, + false + }; + struct LineRun line1 = + { + { 5u, 5u }, + { 5u, 5u }, + 33.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + true, + false + }; + Vector lines; + lines.PushBack( line0 ); + lines.PushBack( line1 ); + + LayoutTextData data = + { + "Layout right to left text that doesn't fit in the text area after reordering.", + "לכאן שנורו", // If this text is laid-out ltr the width is 64. When reordered, the length is 66. This might cause alignment issues. + textArea, + 1u, + fontDescriptionRuns.Begin(), + layoutSize, + 10u, + positions, + 2u, + lines.Begin(), + Layout::Engine::MULTI_LINE_BOX, + 0u, + 10u, + false, + true + }; + + if( !LayoutTextTest( data ) ) + { + tet_result(TET_FAIL); + } + + tet_result(TET_PASS); + END_TEST; +} + +int UtcDaliTextLayoutMultilineText07(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliTextLayoutMultilineText07"); + + const std::string fontFamily( "TizenSansHebrew" ); + + // Set a known font description + FontDescriptionRun fontDescriptionRun; + fontDescriptionRun.characterRun.characterIndex = 0u; + fontDescriptionRun.characterRun.numberOfCharacters = 9u; + fontDescriptionRun.familyLength = fontFamily.size(); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyDefined = true; + fontDescriptionRun.weightDefined = false; + fontDescriptionRun.widthDefined = false; + fontDescriptionRun.slantDefined = false; + fontDescriptionRun.sizeDefined = false; + + Vector fontDescriptionRuns; + fontDescriptionRuns.PushBack( fontDescriptionRun ); + + Size textArea(26.f, 100.f); + Size layoutSize(23.f, 57.f); + float positions[] = + { + 11.f, -10.f, 5.f, -10.f, 0.f, -10.f, + 12.f, -10.f, 8.f, -10.f, 0.f, -13.f, + 14.f, -10.f, 4.f, -10.f, 0.f, -10.f + }; + struct LineRun line0 = + { + { 0u, 3u }, + { 0u, 3u }, + 20.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + true, + false + }; + struct LineRun line1 = + { + { 3u, 3u }, + { 3u, 3u }, + 22.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + true, + false + }; + struct LineRun line2 = + { + { 6u, 3u }, + { 6u, 3u }, + 23.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + true, + false + }; + Vector lines; + lines.PushBack( line0 ); + lines.PushBack( line1 ); + lines.PushBack( line2 ); + + LayoutTextData data = + { + "Layout a single word of right to left text that doesn't fit in one single line. When layouting ltr a piece of word fits in the line but it doesn't after reordering.", + "שנורולכאן", // If a piece of this text is laid-out ltr the width is 26. When reordered, the length is 27. This might cause alignment issues. + textArea, + 1u, + fontDescriptionRuns.Begin(), + layoutSize, + 9u, + positions, + 3u, + lines.Begin(), + Layout::Engine::MULTI_LINE_BOX, + 0u, + 9u, + false, + true + }; + + if( !LayoutTextTest( data ) ) + { + tet_result(TET_FAIL); + } + + tet_result(TET_PASS); + END_TEST; +} + int UtcDaliTextUpdateLayout01(void) { ToolkitTestApplication application; @@ -1453,7 +1524,7 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun02; fontDescriptionRun02.characterRun.characterIndex = 17u; - fontDescriptionRun02.characterRun.numberOfCharacters = 11u; + fontDescriptionRun02.characterRun.numberOfCharacters = 9u; fontDescriptionRun02.familyLength = fontHebrew.size(); fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength]; memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength ); @@ -1465,11 +1536,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun03; - fontDescriptionRun03.characterRun.characterIndex = 28u; - fontDescriptionRun03.characterRun.numberOfCharacters = 14u; - fontDescriptionRun03.familyLength = fontArabic.size(); + fontDescriptionRun03.characterRun.characterIndex = 26u; + fontDescriptionRun03.characterRun.numberOfCharacters = 2u; + fontDescriptionRun03.familyLength = fontLatin.size(); fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength]; - memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength ); + memcpy( fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength ); fontDescriptionRun03.familyDefined = true; fontDescriptionRun03.weightDefined = false; fontDescriptionRun03.widthDefined = false; @@ -1478,11 +1549,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun04; - fontDescriptionRun04.characterRun.characterIndex = 42u; - fontDescriptionRun04.characterRun.numberOfCharacters = 12u; - fontDescriptionRun04.familyLength = fontLatin.size(); + fontDescriptionRun04.characterRun.characterIndex = 28u; + fontDescriptionRun04.characterRun.numberOfCharacters = 14u; + fontDescriptionRun04.familyLength = fontArabic.size(); fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength]; - memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength ); + memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength ); fontDescriptionRun04.familyDefined = true; fontDescriptionRun04.weightDefined = false; fontDescriptionRun04.widthDefined = false; @@ -1491,11 +1562,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun05; - fontDescriptionRun05.characterRun.characterIndex = 54u; - fontDescriptionRun05.characterRun.numberOfCharacters = 10u; - fontDescriptionRun05.familyLength = fontHebrew.size(); + fontDescriptionRun05.characterRun.characterIndex = 42u; + fontDescriptionRun05.characterRun.numberOfCharacters = 12u; + fontDescriptionRun05.familyLength = fontLatin.size(); fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength]; - memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength ); + memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength ); fontDescriptionRun05.familyDefined = true; fontDescriptionRun05.weightDefined = false; fontDescriptionRun05.widthDefined = false; @@ -1504,7 +1575,7 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun06; - fontDescriptionRun06.characterRun.characterIndex = 64u; + fontDescriptionRun06.characterRun.characterIndex = 54u; fontDescriptionRun06.characterRun.numberOfCharacters = 10u; fontDescriptionRun06.familyLength = fontHebrew.size(); fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength]; @@ -1517,11 +1588,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun07; - fontDescriptionRun07.characterRun.characterIndex = 74u; - fontDescriptionRun07.characterRun.numberOfCharacters = 18u; - fontDescriptionRun07.familyLength = fontLatin.size(); + fontDescriptionRun07.characterRun.characterIndex = 64u; + fontDescriptionRun07.characterRun.numberOfCharacters = 10u; + fontDescriptionRun07.familyLength = fontHebrew.size(); fontDescriptionRun07.familyName = new char[fontDescriptionRun07.familyLength]; - memcpy( fontDescriptionRun07.familyName, fontLatin.c_str(), fontDescriptionRun07.familyLength ); + memcpy( fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength ); fontDescriptionRun07.familyDefined = true; fontDescriptionRun07.weightDefined = false; fontDescriptionRun07.widthDefined = false; @@ -1530,8 +1601,8 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun08; - fontDescriptionRun08.characterRun.characterIndex = 92u; - fontDescriptionRun08.characterRun.numberOfCharacters = 12u; + fontDescriptionRun08.characterRun.characterIndex = 74u; + fontDescriptionRun08.characterRun.numberOfCharacters = 18u; fontDescriptionRun08.familyLength = fontLatin.size(); fontDescriptionRun08.familyName = new char[fontDescriptionRun08.familyLength]; memcpy( fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength ); @@ -1543,11 +1614,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun09; - fontDescriptionRun09.characterRun.characterIndex = 104u; - fontDescriptionRun09.characterRun.numberOfCharacters = 14u; - fontDescriptionRun09.familyLength = fontArabic.size(); + fontDescriptionRun09.characterRun.characterIndex = 92u; + fontDescriptionRun09.characterRun.numberOfCharacters = 12u; + fontDescriptionRun09.familyLength = fontLatin.size(); fontDescriptionRun09.familyName = new char[fontDescriptionRun09.familyLength]; - memcpy( fontDescriptionRun09.familyName, fontArabic.c_str(), fontDescriptionRun09.familyLength ); + memcpy( fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength ); fontDescriptionRun09.familyDefined = true; fontDescriptionRun09.weightDefined = false; fontDescriptionRun09.widthDefined = false; @@ -1556,11 +1627,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun10; - fontDescriptionRun10.characterRun.characterIndex = 118u; - fontDescriptionRun10.characterRun.numberOfCharacters = 10u; - fontDescriptionRun10.familyLength = fontHebrew.size(); + fontDescriptionRun10.characterRun.characterIndex = 104u; + fontDescriptionRun10.characterRun.numberOfCharacters = 14u; + fontDescriptionRun10.familyLength = fontArabic.size(); fontDescriptionRun10.familyName = new char[fontDescriptionRun10.familyLength]; - memcpy( fontDescriptionRun10.familyName, fontHebrew.c_str(), fontDescriptionRun10.familyLength ); + memcpy( fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength ); fontDescriptionRun10.familyDefined = true; fontDescriptionRun10.weightDefined = false; fontDescriptionRun10.widthDefined = false; @@ -1569,11 +1640,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun11; - fontDescriptionRun11.characterRun.characterIndex = 128u; - fontDescriptionRun11.characterRun.numberOfCharacters = 17u; - fontDescriptionRun11.familyLength = fontLatin.size(); + fontDescriptionRun11.characterRun.characterIndex = 118u; + fontDescriptionRun11.characterRun.numberOfCharacters = 10u; + fontDescriptionRun11.familyLength = fontHebrew.size(); fontDescriptionRun11.familyName = new char[fontDescriptionRun11.familyLength]; - memcpy( fontDescriptionRun11.familyName, fontLatin.c_str(), fontDescriptionRun11.familyLength ); + memcpy( fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength ); fontDescriptionRun11.familyDefined = true; fontDescriptionRun11.weightDefined = false; fontDescriptionRun11.widthDefined = false; @@ -1582,11 +1653,11 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun12; - fontDescriptionRun12.characterRun.characterIndex = 145u; - fontDescriptionRun12.characterRun.numberOfCharacters = 11u; - fontDescriptionRun12.familyLength = fontHebrew.size(); + fontDescriptionRun12.characterRun.characterIndex = 128u; + fontDescriptionRun12.characterRun.numberOfCharacters = 17u; + fontDescriptionRun12.familyLength = fontLatin.size(); fontDescriptionRun12.familyName = new char[fontDescriptionRun12.familyLength]; - memcpy( fontDescriptionRun12.familyName, fontHebrew.c_str(), fontDescriptionRun12.familyLength ); + memcpy( fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength ); fontDescriptionRun12.familyDefined = true; fontDescriptionRun12.weightDefined = false; fontDescriptionRun12.widthDefined = false; @@ -1595,8 +1666,8 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun13; - fontDescriptionRun13.characterRun.characterIndex = 156u; - fontDescriptionRun13.characterRun.numberOfCharacters = 10u; + fontDescriptionRun13.characterRun.characterIndex = 145u; + fontDescriptionRun13.characterRun.numberOfCharacters = 9u; fontDescriptionRun13.familyLength = fontHebrew.size(); fontDescriptionRun13.familyName = new char[fontDescriptionRun13.familyLength]; memcpy( fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength ); @@ -1608,8 +1679,8 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun14; - fontDescriptionRun14.characterRun.characterIndex = 166u; - fontDescriptionRun14.characterRun.numberOfCharacters = 12u; + fontDescriptionRun14.characterRun.characterIndex = 154u; + fontDescriptionRun14.characterRun.numberOfCharacters = 2u; fontDescriptionRun14.familyLength = fontLatin.size(); fontDescriptionRun14.familyName = new char[fontDescriptionRun14.familyLength]; memcpy( fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength ); @@ -1621,17 +1692,43 @@ int UtcDaliTextUpdateLayout01(void) // Set a known font description FontDescriptionRun fontDescriptionRun15; - fontDescriptionRun15.characterRun.characterIndex = 178u; - fontDescriptionRun15.characterRun.numberOfCharacters = 14u; - fontDescriptionRun15.familyLength = fontArabic.size(); + fontDescriptionRun15.characterRun.characterIndex = 156u; + fontDescriptionRun15.characterRun.numberOfCharacters = 10u; + fontDescriptionRun15.familyLength = fontHebrew.size(); fontDescriptionRun15.familyName = new char[fontDescriptionRun15.familyLength]; - memcpy( fontDescriptionRun15.familyName, fontArabic.c_str(), fontDescriptionRun15.familyLength ); + memcpy( fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength ); fontDescriptionRun15.familyDefined = true; fontDescriptionRun15.weightDefined = false; fontDescriptionRun15.widthDefined = false; fontDescriptionRun15.slantDefined = false; fontDescriptionRun15.sizeDefined = false; + // Set a known font description + FontDescriptionRun fontDescriptionRun16; + fontDescriptionRun16.characterRun.characterIndex = 166u; + fontDescriptionRun16.characterRun.numberOfCharacters = 12u; + fontDescriptionRun16.familyLength = fontLatin.size(); + fontDescriptionRun16.familyName = new char[fontDescriptionRun16.familyLength]; + memcpy( fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength ); + fontDescriptionRun16.familyDefined = true; + fontDescriptionRun16.weightDefined = false; + fontDescriptionRun16.widthDefined = false; + fontDescriptionRun16.slantDefined = false; + fontDescriptionRun16.sizeDefined = false; + + // Set a known font description + FontDescriptionRun fontDescriptionRun17; + fontDescriptionRun17.characterRun.characterIndex = 178u; + fontDescriptionRun17.characterRun.numberOfCharacters = 14u; + fontDescriptionRun17.familyLength = fontArabic.size(); + fontDescriptionRun17.familyName = new char[fontDescriptionRun17.familyLength]; + memcpy( fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength ); + fontDescriptionRun17.familyDefined = true; + fontDescriptionRun17.weightDefined = false; + fontDescriptionRun17.widthDefined = false; + fontDescriptionRun17.slantDefined = false; + fontDescriptionRun17.sizeDefined = false; + Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun01 ); fontDescriptionRuns.PushBack( fontDescriptionRun02 ); @@ -1648,37 +1745,41 @@ int UtcDaliTextUpdateLayout01(void) fontDescriptionRuns.PushBack( fontDescriptionRun13 ); fontDescriptionRuns.PushBack( fontDescriptionRun14 ); fontDescriptionRuns.PushBack( fontDescriptionRun15 ); + fontDescriptionRuns.PushBack( fontDescriptionRun16 ); + fontDescriptionRuns.PushBack( fontDescriptionRun17 ); Size textArea(100.f, 300.f); - Size layoutSize(92.f, 380.f); + Size layoutSize(100.f, 361.f); float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 15.f, - 0.f, 22.f, 10.f, 26.f, 18.f, 26.f, 30.f, 26.f, 39.f, 35.f, 44.f, 25.f, 55.f, 22.f, 62.f, 25.f, 67.f, 25.f, 75.f, 35.f, - 1.f, 45.f, 9.f, 45.f, 14.f, 42.f, 22.f, 45.f, 32.f, 53.f, 35.f, 44.f, - 0.f, 67.f, 7.f, 69.f, 12.f, 68.f, 18.f, 68.f, 23.f, 64.f, 25.f, 75.f, 27.f, 68.f, 32.f, 64.f, 33.f, 64.f, 37.f, 67.f, 44.f, 64.f, 45.f, 64.f, 49.f, 67.f, 55.f, 75.f, 59.f, 62.f, 68.f, 66.f, 76.f, 62.f, 80.f, 62.f, 83.f, 66.f, 92.f, 75.f, - 0.f, 86.f, 11.f, 86.f, 21.f, 86.f, 27.f, 82.f, 30.f, 82.f, 39.f, 95.f, 44.f, 85.f, 55.f, 82.f, 62.f, 85.f, 67.f, 85.f, 75.f, 95.f, - 1.f, 105.f, 9.f, 105.f, 14.f, 102.f, 22.f, 105.f, 30.f, 115.f, - 1.f, 125.f, 12.f, 122.f, 19.f, 125.f, 24.f, 125.f, 32.f, 135.f, 37.f, 125.f, 45.f, 125.f, 50.f, 122.f, 58.f, 125.f, 66.f, 135.f, - 1.f, 142.f, 10.f, 146.f, 18.f, 142.f, 22.f, 142.f, 25.f, 146.f, 34.f, 155.f, 38.f, 146.f, 49.f, 146.f, 59.f, 146.f, 65.f, 142.f, 68.f, 142.f, 77.f, 155.f, - 0.f, 162.f, 10.f, 166.f, 18.f, 166.f, 30.f, 166.f, 39.f, 172.f, 42.f, 163.f, - 1.f, 182.f, 10.f, 186.f, 18.f, 182.f, 22.f, 182.f, 25.f, 186.f, 34.f, 195.f, 38.f, 186.f, 49.f, 186.f, 59.f, 186.f, 65.f, 182.f, 68.f, 182.f, 77.f, 195.f, - 0.f, 207.f, 7.f, 209.f, 12.f, 208.f, 18.f, 208.f, 23.f, 204.f, 25.f, 215.f, 27.f, 208.f, 32.f, 204.f, 33.f, 204.f, 37.f, 207.f, 44.f, 204.f, 45.f, 204.f, 49.f, 207.f, 55.f, 215.f, 59.f, 205.f, 70.f, 202.f, 77.f, 205.f, 82.f, 205.f, 90.f, 215.f, - 1.f, 225.f, 9.f, 225.f, 14.f, 222.f, 22.f, 225.f, 30.f, 235.f, - 1.f, 243.f, 12.f, 246.f, 20.f, 242.f, 24.f, 242.f, 27.f, 246.f, 36.f, 255.f, 40.f, 246.f, 51.f, 246.f, 61.f, 246.f, 67.f, 242.f, 70.f, 242.f, 79.f, 255.f, - 0.f, 262.f, 10.f, 266.f, 18.f, 266.f, 30.f, 266.f, 39.f, 275.f, 44.f, 265.f, 55.f, 262.f, 62.f, 265.f, 67.f, 265.f, 75.f, 275.f, - 1.f, 285.f, 9.f, 285.f, 14.f, 282.f, 22.f, 285.f, 32.f, 293.f, 35.f, 284.f, - 1.f, 305.f, 12.f, 302.f, 19.f, 305.f, 24.f, 305.f, 32.f, 315.f, 37.f, 305.f, 45.f, 305.f, 50.f, 302.f, 58.f, 305.f, 66.f, 315.f, - 1.f, 322.f, 10.f, 326.f, 18.f, 322.f, 22.f, 322.f, 25.f, 326.f, 34.f, 335.f, 38.f, 326.f, 49.f, 326.f, 59.f, 326.f, 65.f, 322.f, 68.f, 322.f, 77.f, 335.f, - 0.f, 347.f, 7.f, 349.f, 12.f, 348.f, 18.f, 348.f, 23.f, 344.f, 25.f, 355.f, 27.f, 348.f, 32.f, 344.f, 33.f, 344.f, 37.f, 347.f, 44.f, 344.f, 45.f, 344.f, 49.f, 347.f, 55.f, 355.f, + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, // 0 .. 11 + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 69.f, -10.f, 60.f, -13.f, 54.f, -10.f, 46.f, -10.f, 79.f, -0.f, // 12 .. 21 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -2.f, 35.f, -12.f, // 22 .. 27 + 58.f, -8.f, 52.f, -6.f, 45.f, -8.f, 41.f, -7.f, 39.f, -11.f, 34.f, -0.f, 30.f, -7.f, 28.f, -11.f, 23.f, -11.f, 16.f, -8.f, 15.f, -11.f, 9.f, -11.f, 4.f, -8.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, // 28 .. 47 + 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, 59.f, -10.f, 50.f, -13.f, 45.f, -10.f, 36.f, -10.f, 31.f, -0.f, // 48 .. 58 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f, // 59 .. 63 + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, // 64 .. 73 + 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 74 .. 85 + 4.f, -13.f, 13.f, -9.f, 23.f, -9.f, 36.f, -9.f, 0.f, -2.f, 0.f, -12.f, // 86 .. 91 + 0.f, -13.f, 8.f, -9.f, 18.f, -13.f, 22.f, -13.f, 25.f, -9.f, 34.f, -0.f, 38.f, -9.f, 50.f, -9.f, 60.f, -9.f, 66.f, -13.f, 69.f, -13.f, 79.f, -0.f, // 92 .. 103 + 91.f, -8.f, 85.f, -6.f, 78.f, -8.f, 74.f, -7.f, 72.f, -11.f, 67.f, -0.f, 63.f, -7.f, 61.f, -11.f, 56.f, -11.f, 49.f, -8.f, 48.f, -11.f, 42.f, -11.f, 37.f, -8.f, 33.f, -0.f, 23.f, -10.f, 14.f, -13.f, 9.f, -10.f, 0.f, -10.f, 98.f, -0.f, // 104 .. 122 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -0.f, // 123 .. 127 + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, // 128 .. 139 + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 69.f, -10.f, 60.f, -13.f, 54.f, -10.f, 46.f, -10.f, 79.f, -0.f, // 140 .. 149 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -2.f, 35.f, -12.f, // 150 .. 155 + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, // 156 .. 165 + 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 166 .. 177 + 54.f, -8.f, 49.f, -6.f, 41.f, -8.f, 37.f, -7.f, 35.f, -11.f, 31.f, -0.f, 26.f, -7.f, 24.f, -11.f, 19.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f, // 178 .. 191 }; + struct LineRun line01 = { { 0u, 12u }, { 0u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -1687,10 +1788,11 @@ int UtcDaliTextUpdateLayout01(void) { { 12u, 10u }, { 12u, 10u }, - 76.f, + 79.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -1699,9 +1801,10 @@ int UtcDaliTextUpdateLayout01(void) { { 22u, 6u }, { 22u, 6u }, - 36.f, + 34.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1709,35 +1812,38 @@ int UtcDaliTextUpdateLayout01(void) }; struct LineRun line04 = { - { 28u, 20u }, - { 28u, 20u }, - 92.f, + { 28u, 14u }, + { 28u, 14u }, + 63.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, - false, + 0.f, + true, false }; struct LineRun line05 = { - { 48u, 11u }, - { 48u, 11u }, - 76.f, + { 42, 12u }, + { 42, 12u }, + 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, - false, + 0.f, + true, false }; struct LineRun line06 = { - { 59u, 5u }, - { 59u, 5u }, - 31.f, + { 54u, 10u }, + { 54u, 10u }, + 69.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1747,12 +1853,13 @@ int UtcDaliTextUpdateLayout01(void) { { 64u, 10u }, { 64u, 10u }, - 67.f, + 69.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, 0.f, - false, + 0.f, + true, false }; struct LineRun line08 = @@ -1761,19 +1868,21 @@ int UtcDaliTextUpdateLayout01(void) { 74u, 12u }, 79.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, 0.f, - false, + 0.f, + true, false }; struct LineRun line09 = { { 86u, 6u }, { 86u, 6u }, - 43.f, + 45.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1783,11 +1892,12 @@ int UtcDaliTextUpdateLayout01(void) { { 92u, 12u }, { 92u, 12u }, - 78.f, + 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; @@ -1795,10 +1905,11 @@ int UtcDaliTextUpdateLayout01(void) { { 104u, 19u }, { 104u, 19u }, - 90.f, + 100.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -1809,7 +1920,8 @@ int UtcDaliTextUpdateLayout01(void) { 123u, 5u }, 31.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1821,8 +1933,9 @@ int UtcDaliTextUpdateLayout01(void) { 128u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -1831,10 +1944,11 @@ int UtcDaliTextUpdateLayout01(void) { { 140u, 10u }, { 140u, 10u }, - 76.f, + 79.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -1843,9 +1957,10 @@ int UtcDaliTextUpdateLayout01(void) { { 150u, 6u }, { 150u, 6u }, - 36.f, + 34.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1855,12 +1970,13 @@ int UtcDaliTextUpdateLayout01(void) { { 156u, 10u }, { 156u, 10u }, - 67.f, + 69.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, 0.f, - false, + 0.f, + true, false }; struct LineRun line17 = @@ -1869,9 +1985,10 @@ int UtcDaliTextUpdateLayout01(void) { 166u, 12u }, 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; @@ -1879,9 +1996,10 @@ int UtcDaliTextUpdateLayout01(void) { { 178u, 14u }, { 178u, 14u }, - 55.f, + 63.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1893,7 +2011,8 @@ int UtcDaliTextUpdateLayout01(void) { 192u, 0u }, 0.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -1930,14 +2049,14 @@ int UtcDaliTextUpdateLayout01(void) "Hello world demo שלום עולם.\n" "שלום עולם hello world مرحبا بالعالم\n", textArea, - 15u, + 17u, fontDescriptionRuns.Begin(), layoutSize, 192u, positions, 19u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 64u, false, @@ -1980,7 +2099,7 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun02; fontDescriptionRun02.characterRun.characterIndex = 17u; - fontDescriptionRun02.characterRun.numberOfCharacters = 11u; + fontDescriptionRun02.characterRun.numberOfCharacters = 9u; fontDescriptionRun02.familyLength = fontHebrew.size(); fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength]; memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength ); @@ -1992,11 +2111,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun03; - fontDescriptionRun03.characterRun.characterIndex = 28u; - fontDescriptionRun03.characterRun.numberOfCharacters = 14u; - fontDescriptionRun03.familyLength = fontArabic.size(); + fontDescriptionRun03.characterRun.characterIndex = 26u; + fontDescriptionRun03.characterRun.numberOfCharacters = 2u; + fontDescriptionRun03.familyLength = fontLatin.size(); fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength]; - memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength ); + memcpy( fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength ); fontDescriptionRun03.familyDefined = true; fontDescriptionRun03.weightDefined = false; fontDescriptionRun03.widthDefined = false; @@ -2005,11 +2124,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun04; - fontDescriptionRun04.characterRun.characterIndex = 42u; - fontDescriptionRun04.characterRun.numberOfCharacters = 12u; - fontDescriptionRun04.familyLength = fontLatin.size(); + fontDescriptionRun04.characterRun.characterIndex = 28u; + fontDescriptionRun04.characterRun.numberOfCharacters = 14u; + fontDescriptionRun04.familyLength = fontArabic.size(); fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength]; - memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength ); + memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength ); fontDescriptionRun04.familyDefined = true; fontDescriptionRun04.weightDefined = false; fontDescriptionRun04.widthDefined = false; @@ -2018,11 +2137,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun05; - fontDescriptionRun05.characterRun.characterIndex = 54u; - fontDescriptionRun05.characterRun.numberOfCharacters = 10u; - fontDescriptionRun05.familyLength = fontHebrew.size(); + fontDescriptionRun05.characterRun.characterIndex = 42u; + fontDescriptionRun05.characterRun.numberOfCharacters = 12u; + fontDescriptionRun05.familyLength = fontLatin.size(); fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength]; - memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength ); + memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength ); fontDescriptionRun05.familyDefined = true; fontDescriptionRun05.weightDefined = false; fontDescriptionRun05.widthDefined = false; @@ -2031,7 +2150,7 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun06; - fontDescriptionRun06.characterRun.characterIndex = 64u; + fontDescriptionRun06.characterRun.characterIndex = 54u; fontDescriptionRun06.characterRun.numberOfCharacters = 10u; fontDescriptionRun06.familyLength = fontHebrew.size(); fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength]; @@ -2044,11 +2163,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun07; - fontDescriptionRun07.characterRun.characterIndex = 74u; - fontDescriptionRun07.characterRun.numberOfCharacters = 18u; - fontDescriptionRun07.familyLength = fontLatin.size(); + fontDescriptionRun07.characterRun.characterIndex = 64u; + fontDescriptionRun07.characterRun.numberOfCharacters = 10u; + fontDescriptionRun07.familyLength = fontHebrew.size(); fontDescriptionRun07.familyName = new char[fontDescriptionRun07.familyLength]; - memcpy( fontDescriptionRun07.familyName, fontLatin.c_str(), fontDescriptionRun07.familyLength ); + memcpy( fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength ); fontDescriptionRun07.familyDefined = true; fontDescriptionRun07.weightDefined = false; fontDescriptionRun07.widthDefined = false; @@ -2057,8 +2176,8 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun08; - fontDescriptionRun08.characterRun.characterIndex = 92u; - fontDescriptionRun08.characterRun.numberOfCharacters = 12u; + fontDescriptionRun08.characterRun.characterIndex = 74u; + fontDescriptionRun08.characterRun.numberOfCharacters = 18u; fontDescriptionRun08.familyLength = fontLatin.size(); fontDescriptionRun08.familyName = new char[fontDescriptionRun08.familyLength]; memcpy( fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength ); @@ -2070,11 +2189,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun09; - fontDescriptionRun09.characterRun.characterIndex = 104u; - fontDescriptionRun09.characterRun.numberOfCharacters = 14u; - fontDescriptionRun09.familyLength = fontArabic.size(); + fontDescriptionRun09.characterRun.characterIndex = 92u; + fontDescriptionRun09.characterRun.numberOfCharacters = 12u; + fontDescriptionRun09.familyLength = fontLatin.size(); fontDescriptionRun09.familyName = new char[fontDescriptionRun09.familyLength]; - memcpy( fontDescriptionRun09.familyName, fontArabic.c_str(), fontDescriptionRun09.familyLength ); + memcpy( fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength ); fontDescriptionRun09.familyDefined = true; fontDescriptionRun09.weightDefined = false; fontDescriptionRun09.widthDefined = false; @@ -2083,11 +2202,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun10; - fontDescriptionRun10.characterRun.characterIndex = 118u; - fontDescriptionRun10.characterRun.numberOfCharacters = 10u; - fontDescriptionRun10.familyLength = fontHebrew.size(); + fontDescriptionRun10.characterRun.characterIndex = 104u; + fontDescriptionRun10.characterRun.numberOfCharacters = 14u; + fontDescriptionRun10.familyLength = fontArabic.size(); fontDescriptionRun10.familyName = new char[fontDescriptionRun10.familyLength]; - memcpy( fontDescriptionRun10.familyName, fontHebrew.c_str(), fontDescriptionRun10.familyLength ); + memcpy( fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength ); fontDescriptionRun10.familyDefined = true; fontDescriptionRun10.weightDefined = false; fontDescriptionRun10.widthDefined = false; @@ -2096,11 +2215,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun11; - fontDescriptionRun11.characterRun.characterIndex = 128u; - fontDescriptionRun11.characterRun.numberOfCharacters = 17u; - fontDescriptionRun11.familyLength = fontLatin.size(); + fontDescriptionRun11.characterRun.characterIndex = 118u; + fontDescriptionRun11.characterRun.numberOfCharacters = 10u; + fontDescriptionRun11.familyLength = fontHebrew.size(); fontDescriptionRun11.familyName = new char[fontDescriptionRun11.familyLength]; - memcpy( fontDescriptionRun11.familyName, fontLatin.c_str(), fontDescriptionRun11.familyLength ); + memcpy( fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength ); fontDescriptionRun11.familyDefined = true; fontDescriptionRun11.weightDefined = false; fontDescriptionRun11.widthDefined = false; @@ -2109,11 +2228,11 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun12; - fontDescriptionRun12.characterRun.characterIndex = 145u; - fontDescriptionRun12.characterRun.numberOfCharacters = 11u; - fontDescriptionRun12.familyLength = fontHebrew.size(); + fontDescriptionRun12.characterRun.characterIndex = 128u; + fontDescriptionRun12.characterRun.numberOfCharacters = 17u; + fontDescriptionRun12.familyLength = fontLatin.size(); fontDescriptionRun12.familyName = new char[fontDescriptionRun12.familyLength]; - memcpy( fontDescriptionRun12.familyName, fontHebrew.c_str(), fontDescriptionRun12.familyLength ); + memcpy( fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength ); fontDescriptionRun12.familyDefined = true; fontDescriptionRun12.weightDefined = false; fontDescriptionRun12.widthDefined = false; @@ -2122,8 +2241,8 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun13; - fontDescriptionRun13.characterRun.characterIndex = 156u; - fontDescriptionRun13.characterRun.numberOfCharacters = 10u; + fontDescriptionRun13.characterRun.characterIndex = 145u; + fontDescriptionRun13.characterRun.numberOfCharacters = 9u; fontDescriptionRun13.familyLength = fontHebrew.size(); fontDescriptionRun13.familyName = new char[fontDescriptionRun13.familyLength]; memcpy( fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength ); @@ -2135,8 +2254,8 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun14; - fontDescriptionRun14.characterRun.characterIndex = 166u; - fontDescriptionRun14.characterRun.numberOfCharacters = 12u; + fontDescriptionRun14.characterRun.characterIndex = 154u; + fontDescriptionRun14.characterRun.numberOfCharacters = 2u; fontDescriptionRun14.familyLength = fontLatin.size(); fontDescriptionRun14.familyName = new char[fontDescriptionRun14.familyLength]; memcpy( fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength ); @@ -2148,17 +2267,43 @@ int UtcDaliTextUpdateLayout02(void) // Set a known font description FontDescriptionRun fontDescriptionRun15; - fontDescriptionRun15.characterRun.characterIndex = 178u; - fontDescriptionRun15.characterRun.numberOfCharacters = 14u; - fontDescriptionRun15.familyLength = fontArabic.size(); + fontDescriptionRun15.characterRun.characterIndex = 156u; + fontDescriptionRun15.characterRun.numberOfCharacters = 10u; + fontDescriptionRun15.familyLength = fontHebrew.size(); fontDescriptionRun15.familyName = new char[fontDescriptionRun15.familyLength]; - memcpy( fontDescriptionRun15.familyName, fontArabic.c_str(), fontDescriptionRun15.familyLength ); + memcpy( fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength ); fontDescriptionRun15.familyDefined = true; fontDescriptionRun15.weightDefined = false; fontDescriptionRun15.widthDefined = false; fontDescriptionRun15.slantDefined = false; fontDescriptionRun15.sizeDefined = false; + // Set a known font description + FontDescriptionRun fontDescriptionRun16; + fontDescriptionRun16.characterRun.characterIndex = 166u; + fontDescriptionRun16.characterRun.numberOfCharacters = 12u; + fontDescriptionRun16.familyLength = fontLatin.size(); + fontDescriptionRun16.familyName = new char[fontDescriptionRun16.familyLength]; + memcpy( fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength ); + fontDescriptionRun16.familyDefined = true; + fontDescriptionRun16.weightDefined = false; + fontDescriptionRun16.widthDefined = false; + fontDescriptionRun16.slantDefined = false; + fontDescriptionRun16.sizeDefined = false; + + // Set a known font description + FontDescriptionRun fontDescriptionRun17; + fontDescriptionRun17.characterRun.characterIndex = 178u; + fontDescriptionRun17.characterRun.numberOfCharacters = 14u; + fontDescriptionRun17.familyLength = fontArabic.size(); + fontDescriptionRun17.familyName = new char[fontDescriptionRun17.familyLength]; + memcpy( fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength ); + fontDescriptionRun17.familyDefined = true; + fontDescriptionRun17.weightDefined = false; + fontDescriptionRun17.widthDefined = false; + fontDescriptionRun17.slantDefined = false; + fontDescriptionRun17.sizeDefined = false; + Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun01 ); fontDescriptionRuns.PushBack( fontDescriptionRun02 ); @@ -2175,37 +2320,41 @@ int UtcDaliTextUpdateLayout02(void) fontDescriptionRuns.PushBack( fontDescriptionRun13 ); fontDescriptionRuns.PushBack( fontDescriptionRun14 ); fontDescriptionRuns.PushBack( fontDescriptionRun15 ); + fontDescriptionRuns.PushBack( fontDescriptionRun16 ); + fontDescriptionRuns.PushBack( fontDescriptionRun17 ); Size textArea(100.f, 300.f); - Size layoutSize(92.f, 380.f); + Size layoutSize(100.f, 361.f); float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 15.f, - 0.f, 22.f, 10.f, 26.f, 18.f, 26.f, 30.f, 26.f, 39.f, 35.f, 44.f, 25.f, 55.f, 22.f, 62.f, 25.f, 67.f, 25.f, 75.f, 35.f, - 1.f, 45.f, 9.f, 45.f, 14.f, 42.f, 22.f, 45.f, 32.f, 53.f, 35.f, 44.f, - 0.f, 67.f, 7.f, 69.f, 12.f, 68.f, 18.f, 68.f, 23.f, 64.f, 25.f, 75.f, 27.f, 68.f, 32.f, 64.f, 33.f, 64.f, 37.f, 67.f, 44.f, 64.f, 45.f, 64.f, 49.f, 67.f, 55.f, 75.f, 59.f, 62.f, 68.f, 66.f, 76.f, 62.f, 80.f, 62.f, 83.f, 66.f, 92.f, 75.f, - 0.f, 86.f, 11.f, 86.f, 21.f, 86.f, 27.f, 82.f, 30.f, 82.f, 39.f, 95.f, 44.f, 85.f, 55.f, 82.f, 62.f, 85.f, 67.f, 85.f, 75.f, 95.f, - 1.f, 105.f, 9.f, 105.f, 14.f, 102.f, 22.f, 105.f, 30.f, 115.f, - 1.f, 125.f, 12.f, 122.f, 19.f, 125.f, 24.f, 125.f, 32.f, 135.f, 37.f, 125.f, 45.f, 125.f, 50.f, 122.f, 58.f, 125.f, 66.f, 135.f, - 1.f, 142.f, 10.f, 146.f, 18.f, 142.f, 22.f, 142.f, 25.f, 146.f, 34.f, 155.f, 38.f, 146.f, 49.f, 146.f, 59.f, 146.f, 65.f, 142.f, 68.f, 142.f, 77.f, 155.f, - 0.f, 162.f, 10.f, 166.f, 18.f, 166.f, 30.f, 166.f, 39.f, 172.f, 42.f, 163.f, - 1.f, 182.f, 10.f, 186.f, 18.f, 182.f, 22.f, 182.f, 25.f, 186.f, 34.f, 195.f, 38.f, 186.f, 49.f, 186.f, 59.f, 186.f, 65.f, 182.f, 68.f, 182.f, 77.f, 195.f, - 0.f, 207.f, 7.f, 209.f, 12.f, 208.f, 18.f, 208.f, 23.f, 204.f, 25.f, 215.f, 27.f, 208.f, 32.f, 204.f, 33.f, 204.f, 37.f, 207.f, 44.f, 204.f, 45.f, 204.f, 49.f, 207.f, 55.f, 215.f, 59.f, 205.f, 70.f, 202.f, 77.f, 205.f, 82.f, 205.f, 90.f, 215.f, - 1.f, 225.f, 9.f, 225.f, 14.f, 222.f, 22.f, 225.f, 30.f, 235.f, - 1.f, 243.f, 12.f, 246.f, 20.f, 242.f, 24.f, 242.f, 27.f, 246.f, 36.f, 255.f, 40.f, 246.f, 51.f, 246.f, 61.f, 246.f, 67.f, 242.f, 70.f, 242.f, 79.f, 255.f, - 0.f, 262.f, 10.f, 266.f, 18.f, 266.f, 30.f, 266.f, 39.f, 275.f, 44.f, 265.f, 55.f, 262.f, 62.f, 265.f, 67.f, 265.f, 75.f, 275.f, - 1.f, 285.f, 9.f, 285.f, 14.f, 282.f, 22.f, 285.f, 32.f, 293.f, 35.f, 284.f, - 1.f, 305.f, 12.f, 302.f, 19.f, 305.f, 24.f, 305.f, 32.f, 315.f, 37.f, 305.f, 45.f, 305.f, 50.f, 302.f, 58.f, 305.f, 66.f, 315.f, - 1.f, 322.f, 10.f, 326.f, 18.f, 322.f, 22.f, 322.f, 25.f, 326.f, 34.f, 335.f, 38.f, 326.f, 49.f, 326.f, 59.f, 326.f, 65.f, 322.f, 68.f, 322.f, 77.f, 335.f, - 0.f, 347.f, 7.f, 349.f, 12.f, 348.f, 18.f, 348.f, 23.f, 344.f, 25.f, 355.f, 27.f, 348.f, 32.f, 344.f, 33.f, 344.f, 37.f, 347.f, 44.f, 344.f, 45.f, 344.f, 49.f, 347.f, 55.f, 355.f, + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, // 0 .. 11 + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 69.f, -10.f, 60.f, -13.f, 54.f, -10.f, 46.f, -10.f, 79.f, -0.f, // 12 .. 21 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -2.f, 35.f, -12.f, // 22 .. 27 + 58.f, -8.f, 52.f, -6.f, 45.f, -8.f, 41.f, -7.f, 39.f, -11.f, 34.f, -0.f, 30.f, -7.f, 28.f, -11.f, 23.f, -11.f, 16.f, -8.f, 15.f, -11.f, 9.f, -11.f, 4.f, -8.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, // 28 .. 47 + 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, 59.f, -10.f, 50.f, -13.f, 45.f, -10.f, 36.f, -10.f, 31.f, -0.f, // 48 .. 58 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f, // 59 .. 63 + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, // 64 .. 73 + 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 74 .. 85 + 4.f, -13.f, 13.f, -9.f, 23.f, -9.f, 36.f, -9.f, 0.f, -2.f, 0.f, -12.f, // 86 .. 91 + 0.f, -13.f, 8.f, -9.f, 18.f, -13.f, 22.f, -13.f, 25.f, -9.f, 34.f, -0.f, 38.f, -9.f, 50.f, -9.f, 60.f, -9.f, 66.f, -13.f, 69.f, -13.f, 79.f, -0.f, // 92 .. 103 + 91.f, -8.f, 85.f, -6.f, 78.f, -8.f, 74.f, -7.f, 72.f, -11.f, 67.f, -0.f, 63.f, -7.f, 61.f, -11.f, 56.f, -11.f, 49.f, -8.f, 48.f, -11.f, 42.f, -11.f, 37.f, -8.f, 33.f, -0.f, 23.f, -10.f, 14.f, -13.f, 9.f, -10.f, 0.f, -10.f, 98.f, -0.f, // 104 .. 122 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -0.f, // 123 .. 127 + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, // 128 .. 139 + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 69.f, -10.f, 60.f, -13.f, 54.f, -10.f, 46.f, -10.f, 79.f, -0.f, // 140 .. 149 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -2.f, 35.f, -12.f, // 150 .. 155 + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, // 156 .. 165 + 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 166 .. 177 + 54.f, -8.f, 49.f, -6.f, 41.f, -8.f, 37.f, -7.f, 35.f, -11.f, 31.f, -0.f, 26.f, -7.f, 24.f, -11.f, 19.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f, // 178 .. 191 }; + struct LineRun line01 = { { 0u, 12u }, { 0u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -2214,10 +2363,11 @@ int UtcDaliTextUpdateLayout02(void) { { 12u, 10u }, { 12u, 10u }, - 76.f, + 79.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2226,9 +2376,10 @@ int UtcDaliTextUpdateLayout02(void) { { 22u, 6u }, { 22u, 6u }, - 36.f, + 34.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2236,35 +2387,38 @@ int UtcDaliTextUpdateLayout02(void) }; struct LineRun line04 = { - { 28u, 20u }, - { 28u, 20u }, - 92.f, + { 28u, 14u }, + { 28u, 14u }, + 63.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, - false, + 0.f, + true, false }; struct LineRun line05 = { - { 48u, 11u }, - { 48u, 11u }, - 76.f, + { 42u, 12u }, + { 42u, 12u }, + 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; struct LineRun line06 = { - { 59u, 5u }, - { 59u, 5u }, - 31.f, + { 54u, 10u }, + { 54u, 10u }, + 69.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2274,10 +2428,11 @@ int UtcDaliTextUpdateLayout02(void) { { 64u, 10u }, { 64u, 10u }, - 67.f, + 69.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2288,8 +2443,9 @@ int UtcDaliTextUpdateLayout02(void) { 74u, 12u }, 79.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 1.f, 0.f, false, false @@ -2298,9 +2454,10 @@ int UtcDaliTextUpdateLayout02(void) { { 86u, 6u }, { 86u, 6u }, - 43.f, + 45.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2310,11 +2467,12 @@ int UtcDaliTextUpdateLayout02(void) { { 92u, 12u }, { 92u, 12u }, - 78.f, + 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; @@ -2322,10 +2480,11 @@ int UtcDaliTextUpdateLayout02(void) { { 104u, 19u }, { 104u, 19u }, - 90.f, + 100.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2336,7 +2495,8 @@ int UtcDaliTextUpdateLayout02(void) { 123u, 5u }, 31.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2348,8 +2508,9 @@ int UtcDaliTextUpdateLayout02(void) { 128u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -2358,10 +2519,11 @@ int UtcDaliTextUpdateLayout02(void) { { 140u, 10u }, { 140u, 10u }, - 76.f, + 79.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2370,9 +2532,10 @@ int UtcDaliTextUpdateLayout02(void) { { 150u, 6u }, { 150u, 6u }, - 36.f, + 34.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2382,10 +2545,11 @@ int UtcDaliTextUpdateLayout02(void) { { 156u, 10u }, { 156u, 10u }, - 67.f, + 69.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2396,9 +2560,10 @@ int UtcDaliTextUpdateLayout02(void) { 166u, 12u }, 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; @@ -2406,9 +2571,10 @@ int UtcDaliTextUpdateLayout02(void) { { 178u, 14u }, { 178u, 14u }, - 55.f, + 63.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2420,7 +2586,8 @@ int UtcDaliTextUpdateLayout02(void) { 192u, 0u }, 0.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2457,14 +2624,14 @@ int UtcDaliTextUpdateLayout02(void) "Hello world demo שלום עולם.\n" "שלום עולם hello world مرحبا بالعالم\n", textArea, - 15u, + 17u, fontDescriptionRuns.Begin(), layoutSize, 192u, positions, 19u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 64u, 64u, false, @@ -2507,7 +2674,7 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun02; fontDescriptionRun02.characterRun.characterIndex = 17u; - fontDescriptionRun02.characterRun.numberOfCharacters = 11u; + fontDescriptionRun02.characterRun.numberOfCharacters = 9u; fontDescriptionRun02.familyLength = fontHebrew.size(); fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength]; memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength ); @@ -2519,11 +2686,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun03; - fontDescriptionRun03.characterRun.characterIndex = 28u; - fontDescriptionRun03.characterRun.numberOfCharacters = 14u; - fontDescriptionRun03.familyLength = fontArabic.size(); + fontDescriptionRun03.characterRun.characterIndex = 26u; + fontDescriptionRun03.characterRun.numberOfCharacters = 2u; + fontDescriptionRun03.familyLength = fontLatin.size(); fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength]; - memcpy( fontDescriptionRun03.familyName, fontArabic.c_str(), fontDescriptionRun03.familyLength ); + memcpy( fontDescriptionRun03.familyName, fontLatin.c_str(), fontDescriptionRun03.familyLength ); fontDescriptionRun03.familyDefined = true; fontDescriptionRun03.weightDefined = false; fontDescriptionRun03.widthDefined = false; @@ -2532,11 +2699,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun04; - fontDescriptionRun04.characterRun.characterIndex = 42u; - fontDescriptionRun04.characterRun.numberOfCharacters = 12u; - fontDescriptionRun04.familyLength = fontLatin.size(); + fontDescriptionRun04.characterRun.characterIndex = 28u; + fontDescriptionRun04.characterRun.numberOfCharacters = 14u; + fontDescriptionRun04.familyLength = fontArabic.size(); fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength]; - memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength ); + memcpy( fontDescriptionRun04.familyName, fontArabic.c_str(), fontDescriptionRun04.familyLength ); fontDescriptionRun04.familyDefined = true; fontDescriptionRun04.weightDefined = false; fontDescriptionRun04.widthDefined = false; @@ -2545,11 +2712,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun05; - fontDescriptionRun05.characterRun.characterIndex = 54u; - fontDescriptionRun05.characterRun.numberOfCharacters = 10u; - fontDescriptionRun05.familyLength = fontHebrew.size(); + fontDescriptionRun05.characterRun.characterIndex = 42u; + fontDescriptionRun05.characterRun.numberOfCharacters = 12u; + fontDescriptionRun05.familyLength = fontLatin.size(); fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength]; - memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength ); + memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength ); fontDescriptionRun05.familyDefined = true; fontDescriptionRun05.weightDefined = false; fontDescriptionRun05.widthDefined = false; @@ -2558,7 +2725,7 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun06; - fontDescriptionRun06.characterRun.characterIndex = 64u; + fontDescriptionRun06.characterRun.characterIndex = 54u; fontDescriptionRun06.characterRun.numberOfCharacters = 10u; fontDescriptionRun06.familyLength = fontHebrew.size(); fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength]; @@ -2571,11 +2738,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun07; - fontDescriptionRun07.characterRun.characterIndex = 74u; - fontDescriptionRun07.characterRun.numberOfCharacters = 18u; - fontDescriptionRun07.familyLength = fontLatin.size(); + fontDescriptionRun07.characterRun.characterIndex = 64u; + fontDescriptionRun07.characterRun.numberOfCharacters = 10u; + fontDescriptionRun07.familyLength = fontHebrew.size(); fontDescriptionRun07.familyName = new char[fontDescriptionRun07.familyLength]; - memcpy( fontDescriptionRun07.familyName, fontLatin.c_str(), fontDescriptionRun07.familyLength ); + memcpy( fontDescriptionRun07.familyName, fontHebrew.c_str(), fontDescriptionRun07.familyLength ); fontDescriptionRun07.familyDefined = true; fontDescriptionRun07.weightDefined = false; fontDescriptionRun07.widthDefined = false; @@ -2584,8 +2751,8 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun08; - fontDescriptionRun08.characterRun.characterIndex = 92u; - fontDescriptionRun08.characterRun.numberOfCharacters = 12u; + fontDescriptionRun08.characterRun.characterIndex = 74u; + fontDescriptionRun08.characterRun.numberOfCharacters = 18u; fontDescriptionRun08.familyLength = fontLatin.size(); fontDescriptionRun08.familyName = new char[fontDescriptionRun08.familyLength]; memcpy( fontDescriptionRun08.familyName, fontLatin.c_str(), fontDescriptionRun08.familyLength ); @@ -2597,11 +2764,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun09; - fontDescriptionRun09.characterRun.characterIndex = 104u; - fontDescriptionRun09.characterRun.numberOfCharacters = 14u; - fontDescriptionRun09.familyLength = fontArabic.size(); + fontDescriptionRun09.characterRun.characterIndex = 92u; + fontDescriptionRun09.characterRun.numberOfCharacters = 12u; + fontDescriptionRun09.familyLength = fontLatin.size(); fontDescriptionRun09.familyName = new char[fontDescriptionRun09.familyLength]; - memcpy( fontDescriptionRun09.familyName, fontArabic.c_str(), fontDescriptionRun09.familyLength ); + memcpy( fontDescriptionRun09.familyName, fontLatin.c_str(), fontDescriptionRun09.familyLength ); fontDescriptionRun09.familyDefined = true; fontDescriptionRun09.weightDefined = false; fontDescriptionRun09.widthDefined = false; @@ -2610,11 +2777,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun10; - fontDescriptionRun10.characterRun.characterIndex = 118u; - fontDescriptionRun10.characterRun.numberOfCharacters = 10u; - fontDescriptionRun10.familyLength = fontHebrew.size(); + fontDescriptionRun10.characterRun.characterIndex = 104u; + fontDescriptionRun10.characterRun.numberOfCharacters = 14u; + fontDescriptionRun10.familyLength = fontArabic.size(); fontDescriptionRun10.familyName = new char[fontDescriptionRun10.familyLength]; - memcpy( fontDescriptionRun10.familyName, fontHebrew.c_str(), fontDescriptionRun10.familyLength ); + memcpy( fontDescriptionRun10.familyName, fontArabic.c_str(), fontDescriptionRun10.familyLength ); fontDescriptionRun10.familyDefined = true; fontDescriptionRun10.weightDefined = false; fontDescriptionRun10.widthDefined = false; @@ -2623,11 +2790,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun11; - fontDescriptionRun11.characterRun.characterIndex = 128u; - fontDescriptionRun11.characterRun.numberOfCharacters = 17u; - fontDescriptionRun11.familyLength = fontLatin.size(); + fontDescriptionRun11.characterRun.characterIndex = 118u; + fontDescriptionRun11.characterRun.numberOfCharacters = 10u; + fontDescriptionRun11.familyLength = fontHebrew.size(); fontDescriptionRun11.familyName = new char[fontDescriptionRun11.familyLength]; - memcpy( fontDescriptionRun11.familyName, fontLatin.c_str(), fontDescriptionRun11.familyLength ); + memcpy( fontDescriptionRun11.familyName, fontHebrew.c_str(), fontDescriptionRun11.familyLength ); fontDescriptionRun11.familyDefined = true; fontDescriptionRun11.weightDefined = false; fontDescriptionRun11.widthDefined = false; @@ -2636,11 +2803,11 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun12; - fontDescriptionRun12.characterRun.characterIndex = 145u; - fontDescriptionRun12.characterRun.numberOfCharacters = 11u; - fontDescriptionRun12.familyLength = fontHebrew.size(); + fontDescriptionRun12.characterRun.characterIndex = 128u; + fontDescriptionRun12.characterRun.numberOfCharacters = 17u; + fontDescriptionRun12.familyLength = fontLatin.size(); fontDescriptionRun12.familyName = new char[fontDescriptionRun12.familyLength]; - memcpy( fontDescriptionRun12.familyName, fontHebrew.c_str(), fontDescriptionRun12.familyLength ); + memcpy( fontDescriptionRun12.familyName, fontLatin.c_str(), fontDescriptionRun12.familyLength ); fontDescriptionRun12.familyDefined = true; fontDescriptionRun12.weightDefined = false; fontDescriptionRun12.widthDefined = false; @@ -2649,8 +2816,8 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun13; - fontDescriptionRun13.characterRun.characterIndex = 156u; - fontDescriptionRun13.characterRun.numberOfCharacters = 10u; + fontDescriptionRun13.characterRun.characterIndex = 145u; + fontDescriptionRun13.characterRun.numberOfCharacters = 9u; fontDescriptionRun13.familyLength = fontHebrew.size(); fontDescriptionRun13.familyName = new char[fontDescriptionRun13.familyLength]; memcpy( fontDescriptionRun13.familyName, fontHebrew.c_str(), fontDescriptionRun13.familyLength ); @@ -2662,8 +2829,8 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun14; - fontDescriptionRun14.characterRun.characterIndex = 166u; - fontDescriptionRun14.characterRun.numberOfCharacters = 12u; + fontDescriptionRun14.characterRun.characterIndex = 154u; + fontDescriptionRun14.characterRun.numberOfCharacters = 2u; fontDescriptionRun14.familyLength = fontLatin.size(); fontDescriptionRun14.familyName = new char[fontDescriptionRun14.familyLength]; memcpy( fontDescriptionRun14.familyName, fontLatin.c_str(), fontDescriptionRun14.familyLength ); @@ -2675,17 +2842,43 @@ int UtcDaliTextUpdateLayout03(void) // Set a known font description FontDescriptionRun fontDescriptionRun15; - fontDescriptionRun15.characterRun.characterIndex = 178u; - fontDescriptionRun15.characterRun.numberOfCharacters = 14u; - fontDescriptionRun15.familyLength = fontArabic.size(); + fontDescriptionRun15.characterRun.characterIndex = 156u; + fontDescriptionRun15.characterRun.numberOfCharacters = 10u; + fontDescriptionRun15.familyLength = fontHebrew.size(); fontDescriptionRun15.familyName = new char[fontDescriptionRun15.familyLength]; - memcpy( fontDescriptionRun15.familyName, fontArabic.c_str(), fontDescriptionRun15.familyLength ); + memcpy( fontDescriptionRun15.familyName, fontHebrew.c_str(), fontDescriptionRun15.familyLength ); fontDescriptionRun15.familyDefined = true; fontDescriptionRun15.weightDefined = false; fontDescriptionRun15.widthDefined = false; fontDescriptionRun15.slantDefined = false; fontDescriptionRun15.sizeDefined = false; + // Set a known font description + FontDescriptionRun fontDescriptionRun16; + fontDescriptionRun16.characterRun.characterIndex = 166u; + fontDescriptionRun16.characterRun.numberOfCharacters = 12u; + fontDescriptionRun16.familyLength = fontLatin.size(); + fontDescriptionRun16.familyName = new char[fontDescriptionRun16.familyLength]; + memcpy( fontDescriptionRun16.familyName, fontLatin.c_str(), fontDescriptionRun16.familyLength ); + fontDescriptionRun16.familyDefined = true; + fontDescriptionRun16.weightDefined = false; + fontDescriptionRun16.widthDefined = false; + fontDescriptionRun16.slantDefined = false; + fontDescriptionRun16.sizeDefined = false; + + // Set a known font description + FontDescriptionRun fontDescriptionRun17; + fontDescriptionRun17.characterRun.characterIndex = 178u; + fontDescriptionRun17.characterRun.numberOfCharacters = 14u; + fontDescriptionRun17.familyLength = fontArabic.size(); + fontDescriptionRun17.familyName = new char[fontDescriptionRun17.familyLength]; + memcpy( fontDescriptionRun17.familyName, fontArabic.c_str(), fontDescriptionRun17.familyLength ); + fontDescriptionRun17.familyDefined = true; + fontDescriptionRun17.weightDefined = false; + fontDescriptionRun17.widthDefined = false; + fontDescriptionRun17.slantDefined = false; + fontDescriptionRun17.sizeDefined = false; + Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun01 ); fontDescriptionRuns.PushBack( fontDescriptionRun02 ); @@ -2702,37 +2895,41 @@ int UtcDaliTextUpdateLayout03(void) fontDescriptionRuns.PushBack( fontDescriptionRun13 ); fontDescriptionRuns.PushBack( fontDescriptionRun14 ); fontDescriptionRuns.PushBack( fontDescriptionRun15 ); + fontDescriptionRuns.PushBack( fontDescriptionRun16 ); + fontDescriptionRuns.PushBack( fontDescriptionRun17 ); Size textArea(100.f, 300.f); - Size layoutSize(92.f, 380.f); + Size layoutSize(100.f, 361.f); float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 15.f, - 0.f, 22.f, 10.f, 26.f, 18.f, 26.f, 30.f, 26.f, 39.f, 35.f, 44.f, 25.f, 55.f, 22.f, 62.f, 25.f, 67.f, 25.f, 75.f, 35.f, - 1.f, 45.f, 9.f, 45.f, 14.f, 42.f, 22.f, 45.f, 32.f, 53.f, 35.f, 44.f, - 0.f, 67.f, 7.f, 69.f, 12.f, 68.f, 18.f, 68.f, 23.f, 64.f, 25.f, 75.f, 27.f, 68.f, 32.f, 64.f, 33.f, 64.f, 37.f, 67.f, 44.f, 64.f, 45.f, 64.f, 49.f, 67.f, 55.f, 75.f, 59.f, 62.f, 68.f, 66.f, 76.f, 62.f, 80.f, 62.f, 83.f, 66.f, 92.f, 75.f, - 0.f, 86.f, 11.f, 86.f, 21.f, 86.f, 27.f, 82.f, 30.f, 82.f, 39.f, 95.f, 44.f, 85.f, 55.f, 82.f, 62.f, 85.f, 67.f, 85.f, 75.f, 95.f, - 1.f, 105.f, 9.f, 105.f, 14.f, 102.f, 22.f, 105.f, 30.f, 115.f, - 1.f, 125.f, 12.f, 122.f, 19.f, 125.f, 24.f, 125.f, 32.f, 135.f, 37.f, 125.f, 45.f, 125.f, 50.f, 122.f, 58.f, 125.f, 66.f, 135.f, - 1.f, 142.f, 10.f, 146.f, 18.f, 142.f, 22.f, 142.f, 25.f, 146.f, 34.f, 155.f, 38.f, 146.f, 49.f, 146.f, 59.f, 146.f, 65.f, 142.f, 68.f, 142.f, 77.f, 155.f, - 0.f, 162.f, 10.f, 166.f, 18.f, 166.f, 30.f, 166.f, 39.f, 172.f, 42.f, 163.f, - 1.f, 182.f, 10.f, 186.f, 18.f, 182.f, 22.f, 182.f, 25.f, 186.f, 34.f, 195.f, 38.f, 186.f, 49.f, 186.f, 59.f, 186.f, 65.f, 182.f, 68.f, 182.f, 77.f, 195.f, - 0.f, 207.f, 7.f, 209.f, 12.f, 208.f, 18.f, 208.f, 23.f, 204.f, 25.f, 215.f, 27.f, 208.f, 32.f, 204.f, 33.f, 204.f, 37.f, 207.f, 44.f, 204.f, 45.f, 204.f, 49.f, 207.f, 55.f, 215.f, 59.f, 205.f, 70.f, 202.f, 77.f, 205.f, 82.f, 205.f, 90.f, 215.f, - 1.f, 225.f, 9.f, 225.f, 14.f, 222.f, 22.f, 225.f, 30.f, 235.f, - 1.f, 243.f, 12.f, 246.f, 20.f, 242.f, 24.f, 242.f, 27.f, 246.f, 36.f, 255.f, 40.f, 246.f, 51.f, 246.f, 61.f, 246.f, 67.f, 242.f, 70.f, 242.f, 79.f, 255.f, - 0.f, 262.f, 10.f, 266.f, 18.f, 266.f, 30.f, 266.f, 39.f, 275.f, 44.f, 265.f, 55.f, 262.f, 62.f, 265.f, 67.f, 265.f, 75.f, 275.f, - 1.f, 285.f, 9.f, 285.f, 14.f, 282.f, 22.f, 285.f, 32.f, 293.f, 35.f, 284.f, - 1.f, 305.f, 12.f, 302.f, 19.f, 305.f, 24.f, 305.f, 32.f, 315.f, 37.f, 305.f, 45.f, 305.f, 50.f, 302.f, 58.f, 305.f, 66.f, 315.f, - 1.f, 322.f, 10.f, 326.f, 18.f, 322.f, 22.f, 322.f, 25.f, 326.f, 34.f, 335.f, 38.f, 326.f, 49.f, 326.f, 59.f, 326.f, 65.f, 322.f, 68.f, 322.f, 77.f, 335.f, - 0.f, 347.f, 7.f, 349.f, 12.f, 348.f, 18.f, 348.f, 23.f, 344.f, 25.f, 355.f, 27.f, 348.f, 32.f, 344.f, 33.f, 344.f, 37.f, 347.f, 44.f, 344.f, 45.f, 344.f, 49.f, 347.f, 55.f, 355.f, + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, // 0 .. 11 + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 69.f, -10.f, 60.f, -13.f, 54.f, -10.f, 46.f, -10.f, 79.f, -0.f, // 12 .. 21 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -2.f, 35.f, -12.f, // 22 .. 27 + 58.f, -8.f, 52.f, -6.f, 45.f, -8.f, 41.f, -7.f, 39.f, -11.f, 34.f, -0.f, 30.f, -7.f, 28.f, -11.f, 23.f, -11.f, 16.f, -8.f, 15.f, -11.f, 9.f, -11.f, 4.f, -8.f, 0.f, -0.f, 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, // 28 .. 47 + 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, 59.f, -10.f, 50.f, -13.f, 45.f, -10.f, 36.f, -10.f, 31.f, -0.f, // 48 .. 58 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 0.f, -0.f, // 59 .. 63 + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, // 64 .. 73 + 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 74 .. 85 + 4.f, -13.f, 13.f, -9.f, 23.f, -9.f, 36.f, -9.f, 0.f, -2.f, 0.f, -12.f, // 86 .. 91 + 0.f, -13.f, 8.f, -9.f, 18.f, -13.f, 22.f, -13.f, 25.f, -9.f, 34.f, -0.f, 38.f, -9.f, 50.f, -9.f, 60.f, -9.f, 66.f, -13.f, 69.f, -13.f, 79.f, -0.f, // 92 .. 103 + 91.f, -8.f, 85.f, -6.f, 78.f, -8.f, 74.f, -7.f, 72.f, -11.f, 67.f, -0.f, 63.f, -7.f, 61.f, -11.f, 56.f, -11.f, 49.f, -8.f, 48.f, -11.f, 42.f, -11.f, 37.f, -8.f, 33.f, -0.f, 23.f, -10.f, 14.f, -13.f, 9.f, -10.f, 0.f, -10.f, 98.f, -0.f, // 104 .. 122 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -0.f, // 123 .. 127 + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, // 128 .. 139 + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 69.f, -10.f, 60.f, -13.f, 54.f, -10.f, 46.f, -10.f, 79.f, -0.f, // 140 .. 149 + 23.f, -10.f, 18.f, -10.f, 10.f, -13.f, 0.f, -10.f, 31.f, -2.f, 35.f, -12.f, // 150 .. 155 + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, // 156 .. 165 + 4.f, -13.f, 12.f, -9.f, 22.f, -13.f, 26.f, -13.f, 29.f, -9.f, 38.f, -0.f, 42.f, -9.f, 54.f, -9.f, 64.f, -9.f, 70.f, -13.f, 73.f, -13.f, 0.f, -0.f, // 166 .. 177 + 54.f, -8.f, 49.f, -6.f, 41.f, -8.f, 37.f, -7.f, 35.f, -11.f, 31.f, -0.f, 26.f, -7.f, 24.f, -11.f, 19.f, -11.f, 12.f, -8.f, 11.f, -11.f, 5.f, -11.f, 0.f, -8.f, 0.f, -0.f, // 178 .. 191 }; + struct LineRun line01 = { { 0u, 12u }, { 0u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -2741,10 +2938,11 @@ int UtcDaliTextUpdateLayout03(void) { { 12u, 10u }, { 12u, 10u }, - 76.f, + 79.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2753,9 +2951,10 @@ int UtcDaliTextUpdateLayout03(void) { { 22u, 6u }, { 22u, 6u }, - 36.f, + 34.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2763,35 +2962,38 @@ int UtcDaliTextUpdateLayout03(void) }; struct LineRun line04 = { - { 28u, 20u }, - { 28u, 20u }, - 92.f, + { 28u, 14u }, + { 28u, 14u }, + 63.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; struct LineRun line05 = { - { 48u, 11u }, - { 48u, 11u }, - 76.f, + { 42u, 12u }, + { 42u, 12u }, + 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; struct LineRun line06 = { - { 59u, 5u }, - { 59u, 5u }, - 31.f, + { 54u, 10u }, + { 54u, 10u }, + 69.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2801,10 +3003,11 @@ int UtcDaliTextUpdateLayout03(void) { { 64u, 10u }, { 64u, 10u }, - 67.f, + 69.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2815,8 +3018,9 @@ int UtcDaliTextUpdateLayout03(void) { 74u, 12u }, 79.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 1.f, 0.f, false, false @@ -2825,9 +3029,10 @@ int UtcDaliTextUpdateLayout03(void) { { 86u, 6u }, { 86u, 6u }, - 43.f, + 45.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2837,11 +3042,12 @@ int UtcDaliTextUpdateLayout03(void) { { 92u, 12u }, { 92u, 12u }, - 78.f, + 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; @@ -2849,10 +3055,11 @@ int UtcDaliTextUpdateLayout03(void) { { 104u, 19u }, { 104u, 19u }, - 90.f, + 100.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2863,7 +3070,8 @@ int UtcDaliTextUpdateLayout03(void) { 123u, 5u }, 31.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2875,8 +3083,9 @@ int UtcDaliTextUpdateLayout03(void) { 128u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -2885,10 +3094,11 @@ int UtcDaliTextUpdateLayout03(void) { { 140u, 10u }, { 140u, 10u }, - 76.f, + 79.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2897,9 +3107,10 @@ int UtcDaliTextUpdateLayout03(void) { { 150u, 6u }, { 150u, 6u }, - 36.f, + 34.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2909,10 +3120,11 @@ int UtcDaliTextUpdateLayout03(void) { { 156u, 10u }, { 156u, 10u }, - 67.f, + 69.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, false @@ -2923,9 +3135,10 @@ int UtcDaliTextUpdateLayout03(void) { 166u, 12u }, 79.f, 15.f, - -5.f, + -4.f, 4.f, 0.f, + 0.f, false, false }; @@ -2933,9 +3146,10 @@ int UtcDaliTextUpdateLayout03(void) { { 178u, 14u }, { 178u, 14u }, - 55.f, + 63.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2947,7 +3161,8 @@ int UtcDaliTextUpdateLayout03(void) { 192u, 0u }, 0.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -2984,14 +3199,14 @@ int UtcDaliTextUpdateLayout03(void) "Hello world demo שלום עולם.\n" "שלום עולם hello world مرحبا بالعالم\n", textArea, - 15u, + 17u, fontDescriptionRuns.Begin(), layoutSize, 192u, positions, 19u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 128u, 64u, false, @@ -3038,7 +3253,8 @@ int UtcDaliTextLayoutEllipsis01(void) { 0u, 13u }, 93.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -3049,11 +3265,11 @@ int UtcDaliTextLayoutEllipsis01(void) float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 15.f, 83.f, 2.f + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, 85.f, -13.f, }; Size textArea( 100.f, 50.f ); - Size layoutSize( 100.f, 20.f ); + Size layoutSize( 100.f, 19.f ); LayoutTextData data = { @@ -3067,7 +3283,7 @@ int UtcDaliTextLayoutEllipsis01(void) positions, 1u, lines.Begin(), - LayoutEngine::SINGLE_LINE_BOX, + Layout::Engine::SINGLE_LINE_BOX, 0u, 51u, true, @@ -3114,8 +3330,9 @@ int UtcDaliTextLayoutEllipsis02(void) { 0u, 12u }, 81.f, 15.f, - -5.f, - 3.f, + -4.f, + 4.f, + 0.f, 0.f, false, false @@ -3124,9 +3341,10 @@ int UtcDaliTextLayoutEllipsis02(void) { { 12u, 12u }, { 12u, 12u }, - 93.f, + 95.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -3138,12 +3356,12 @@ int UtcDaliTextLayoutEllipsis02(void) float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f, 79.f, 15.f, - 0.f, 22.f, 10.f, 26.f, 18.f, 26.f, 30.f, 26.f, 39.f, 35.f, 44.f, 22.f, 53.f, 26.f, 61.f, 22.f, 65.f, 22.f, 68.f, 26.f, 77.f, 35.f, 81.f, 26.f + 0.f, -12.f, 10.f, -9.f, 20.f, -13.f, 24.f, -13.f, 27.f, -9.f, 36.f, -0.f, 40.f, -9.f, 52.f, -9.f, 62.f, -9.f, 69.f, -13.f, 72.f, -13.f, 81.f, -0.f, + 0.f, -13.f, 9.f, -9.f, 19.f, -9.f, 32.f, -9.f, 41.f, -0.f, 46.f, -13.f, 54.f, -9.f, 64.f, -13.f, 68.f, -13.f, 71.f, -9.f, 80.f, -0.f, 84.f, -9.f, }; Size textArea( 100.f, 50.f ); - Size layoutSize( 100.f, 60.f ); + Size layoutSize( 100.f, 38.f ); LayoutTextData data = { @@ -3157,7 +3375,7 @@ int UtcDaliTextLayoutEllipsis02(void) positions, 2u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 51u, true, @@ -3266,11 +3484,12 @@ int UtcDaliTextLayoutEllipsis03(void) struct LineRun line01 = { - { 0u, 16u }, - { 0u, 16u }, - 95.f, + { 0u, 14u }, + { 0u, 14u }, + 97.f, 15.f, - -5.f, + -4.f, + 0.f, 0.f, 0.f, false, @@ -3281,11 +3500,11 @@ int UtcDaliTextLayoutEllipsis03(void) float positions[] = { - 1.f, 5.f, 12.f, 2.f, 19.f, 5.f, 24.f, 5.f, 32.f, 15.f, 37.f, 5.f, 45.f, 5.f, 50.f, 2.f, 58.f, 5.f, 66.f, 15.f, 69.f, 7.f, 76.f, 9.f, 81.f, 8.f, 87.f, 8.f, 92.f, 4.f, 94.f, 15.f, + 88.f, -10.f, 80.f, -13.f, 74.f, -10.f, 66.f, -10.f, 60.f, -0.f, 52.f, -10.f, 47.f, -10.f, 39.f, -13.f, 30.f, -10.f, 24.f, -0.f, 17.f, -8.f, 12.f, -6.f, 4.f, -8.f, 0.f, -7.f, 77.f, -11.f, 72.f, -0.f, }; Size textArea( 100.f, 50.f ); - Size layoutSize( 100.f, 20.f ); + Size layoutSize( 100.f, 19.f ); LayoutTextData data = { @@ -3299,7 +3518,7 @@ int UtcDaliTextLayoutEllipsis03(void) positions, 1u, lines.Begin(), - LayoutEngine::SINGLE_LINE_BOX, + Layout::Engine::SINGLE_LINE_BOX, 0u, 72u, true, @@ -3408,24 +3627,26 @@ int UtcDaliTextLayoutEllipsis04(void) struct LineRun line01 = { - { 0u, 16u }, - { 0u, 16u }, - 96.f, + { 0u, 10u }, + { 0u, 10u }, + 69.f, 15.f, - -5.f, - 3.f, + -4.f, + 5.f, + 0.f, 0.f, false, false }; struct LineRun line02 = { - { 16u, 18u }, - { 16u, 18u }, - 97.f, + { 10u, 19u }, + { 10u, 19u }, + 99.f, 15.f, - -5.f, - 4.f, + -4.f, + 5.f, + 0.f, 0.f, false, true @@ -3436,16 +3657,16 @@ int UtcDaliTextLayoutEllipsis04(void) float positions[] = { - 1.f, 5.f, 12.f, 2.f, 19.f, 5.f, 24.f, 5.f, 32.f, 15.f, 37.f, 5.f, 45.f, 5.f, 50.f, 2.f, 58.f, 5.f, 66.f, 15.f, 69.f, 7.f, 76.f, 9.f, 81.f, 8.f, 87.f, 8.f, 92.f, 4.f, 94.f, 15.f, - 0.f, 28.f, 5.f, 24.f, 6.f, 24.f, 10.f, 27.f, 17.f, 24.f, 18.f, 24.f, 22.f, 27.f, 28.f, 35.f, 32.f, 25.f, 43.f, 22.f, 50.f, 25.f, 55.f, 25.f, 63.f, 35.f, 68.f, 25.f, 76.f, 25.f, 81.f, 22.f, 89.f, 25.f, 97.f, 35.f + 63.f, -10.f, 54.f, -13.f, 49.f, -10.f, 41.f, -10.f, 35.f, -0.f, 27.f, -10.f, 22.f, -10.f, 14.f, -13.f, 4.f, -10.f, 0.f, -0.f, 95.f, -8.f, 90.f, -6.f, 82.f, -8.f, 78.f, -7.f, 77.f, -11.f, 72.f, -0.f, + 67.f, -7.f, 66.f, -11.f, 60.f, -11.f, 54.f, -8.f, 52.f, -11.f, 46.f, -11.f, 41.f, -8.f, 37.f, -0.f, 27.f, -10.f, 18.f, -13.f, 13.f, -10.f, 4.f, -10.f, 0.f, -0.f, 93.f, -10.f, 88.f, -10.f, 80.f, -13.f, 71.f, -10.f, 65.f, -0.f, }; Size textArea( 100.f, 50.f ); - Size layoutSize( 100.f, 60.f ); + Size layoutSize( 100.f, 38.f ); LayoutTextData data = { - "Layout single-line RTL text with ellipsis.", + "Layout multi-line RTL text with ellipsis.", "שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم שלום עולם مرحبا بالعالم.", textArea, 6u, @@ -3455,7 +3676,7 @@ int UtcDaliTextLayoutEllipsis04(void) positions, 2u, lines.Begin(), - LayoutEngine::MULTI_LINE_BOX, + Layout::Engine::MULTI_LINE_BOX, 0u, 72u, true, @@ -3471,19 +3692,17 @@ int UtcDaliTextLayoutEllipsis04(void) END_TEST; } -int UtcDaliTextReorderLayout01(void) +int UtcDaliTextLayoutEllipsis05(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextReorderLayout01"); - - // Reorder lines. No right to left characters. + tet_infoline(" UtcDaliTextLayoutEllipsis05"); const std::string fontLatin( "TizenSans" ); // Set a known font description FontDescriptionRun fontDescriptionRun01; fontDescriptionRun01.characterRun.characterIndex = 0u; - fontDescriptionRun01.characterRun.numberOfCharacters = 11u; + fontDescriptionRun01.characterRun.numberOfCharacters = 51u; fontDescriptionRun01.familyLength = fontLatin.size(); fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength]; memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength ); @@ -3496,27 +3715,50 @@ int UtcDaliTextReorderLayout01(void) Vector fontDescriptionRuns; fontDescriptionRuns.PushBack( fontDescriptionRun01 ); + struct LineRun line01 = + { + { 0u, 11u }, + { 0u, 11u }, + 81.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + false, + false + }; + Vector lines; + lines.PushBack( line01 ); + float positions[] = { - 1.f, 3.f, 12.f, 6.f, 20.f, 2.f, 24.f, 2.f, 27.f, 6.f, 36.f, 15.f, 40.f, 6.f, 51.f, 6.f, 61.f, 6.f, 67.f, 2.f, 70.f, 2.f + 0.f, -12.f }; - Size textArea( 100.f, 300.f ); + Size textArea( 100.f, 19.f ); + Size layoutSize( 81.f, 19.f ); - ReLayoutRightToLeftLinesData data = + LayoutTextData data = { - "Text with no right to left text.", + "Not enough height.", "Hello world", textArea, 1u, fontDescriptionRuns.Begin(), - 11u, + layoutSize, + 1u, positions, + 1u, + lines.Begin(), + Layout::Engine::MULTI_LINE_BOX, 0u, - 11u + 11u, + true, + true }; - if( !ReLayoutRightToLeftLinesTest( data ) ) + if( !LayoutTextTest( data ) ) { tet_result(TET_FAIL); } @@ -3525,23 +3767,24 @@ int UtcDaliTextReorderLayout01(void) END_TEST; } -int UtcDaliTextReorderLayout02(void) +int UtcDaliTextAlign01(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextReorderLayout02"); + tet_infoline(" UtcDaliTextAlign01"); - // Reorder lines of the first paragraph. + // Calculate text alignment. + const std::string fontLatin( "TizenSans" ); const std::string fontHebrew( "TizenSansHebrew" ); const std::string fontArabic( "TizenSansArabic" ); // Set a known font description FontDescriptionRun fontDescriptionRun01; fontDescriptionRun01.characterRun.characterIndex = 0u; - fontDescriptionRun01.characterRun.numberOfCharacters = 10u; - fontDescriptionRun01.familyLength = fontHebrew.size(); + fontDescriptionRun01.characterRun.numberOfCharacters = 12u; + fontDescriptionRun01.familyLength = fontLatin.size(); fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength]; - memcpy( fontDescriptionRun01.familyName, fontHebrew.c_str(), fontDescriptionRun01.familyLength ); + memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength ); fontDescriptionRun01.familyDefined = true; fontDescriptionRun01.weightDefined = false; fontDescriptionRun01.widthDefined = false; @@ -3549,11 +3792,11 @@ int UtcDaliTextReorderLayout02(void) fontDescriptionRun01.sizeDefined = false; FontDescriptionRun fontDescriptionRun02; - fontDescriptionRun02.characterRun.characterIndex = 10u; - fontDescriptionRun02.characterRun.numberOfCharacters = 14u; - fontDescriptionRun02.familyLength = fontArabic.size(); + fontDescriptionRun02.characterRun.characterIndex = 12u; + fontDescriptionRun02.characterRun.numberOfCharacters = 10u; + fontDescriptionRun02.familyLength = fontHebrew.size(); fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength]; - memcpy( fontDescriptionRun02.familyName, fontArabic.c_str(), fontDescriptionRun02.familyLength ); + memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength ); fontDescriptionRun02.familyDefined = true; fontDescriptionRun02.weightDefined = false; fontDescriptionRun02.widthDefined = false; @@ -3561,7 +3804,7 @@ int UtcDaliTextReorderLayout02(void) fontDescriptionRun02.sizeDefined = false; FontDescriptionRun fontDescriptionRun03; - fontDescriptionRun03.characterRun.characterIndex = 24u; + fontDescriptionRun03.characterRun.characterIndex = 22u; fontDescriptionRun03.characterRun.numberOfCharacters = 14u; fontDescriptionRun03.familyLength = fontArabic.size(); fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength]; @@ -3573,11 +3816,11 @@ int UtcDaliTextReorderLayout02(void) fontDescriptionRun03.sizeDefined = false; FontDescriptionRun fontDescriptionRun04; - fontDescriptionRun04.characterRun.characterIndex = 38u; - fontDescriptionRun04.characterRun.numberOfCharacters = 10u; - fontDescriptionRun04.familyLength = fontHebrew.size(); + fontDescriptionRun04.characterRun.characterIndex = 36u; + fontDescriptionRun04.characterRun.numberOfCharacters = 12u; + fontDescriptionRun04.familyLength = fontLatin.size(); fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength]; - memcpy( fontDescriptionRun04.familyName, fontHebrew.c_str(), fontDescriptionRun04.familyLength ); + memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength ); fontDescriptionRun04.familyDefined = true; fontDescriptionRun04.weightDefined = false; fontDescriptionRun04.widthDefined = false; @@ -3586,10 +3829,10 @@ int UtcDaliTextReorderLayout02(void) FontDescriptionRun fontDescriptionRun05; fontDescriptionRun05.characterRun.characterIndex = 48u; - fontDescriptionRun05.characterRun.numberOfCharacters = 10u; - fontDescriptionRun05.familyLength = fontHebrew.size(); + fontDescriptionRun05.characterRun.numberOfCharacters = 12u; + fontDescriptionRun05.familyLength = fontLatin.size(); fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength]; - memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength ); + memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength ); fontDescriptionRun05.familyDefined = true; fontDescriptionRun05.weightDefined = false; fontDescriptionRun05.widthDefined = false; @@ -3597,8 +3840,8 @@ int UtcDaliTextReorderLayout02(void) fontDescriptionRun05.sizeDefined = false; FontDescriptionRun fontDescriptionRun06; - fontDescriptionRun06.characterRun.characterIndex = 58u; - fontDescriptionRun06.characterRun.numberOfCharacters = 15u; + fontDescriptionRun06.characterRun.characterIndex = 60u; + fontDescriptionRun06.characterRun.numberOfCharacters = 14u; fontDescriptionRun06.familyLength = fontArabic.size(); fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength]; memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength ); @@ -3616,34 +3859,27 @@ int UtcDaliTextReorderLayout02(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = - { - 87.f, 5.f, 79.f, 2.f, 74.f, 5.f, 66.f, 5.f, 61.f, 15.f, 53.f, 5.f, 48.f, 5.f, 41.f, 2.f, 32.f, 5.f, 27.f, 15.f, 20.f, 7.f, 15.f, 9.f, 8.f, 8.f, 5.f, 8.f, 4.f, 4.f, 0.f, 15.f, - 23.f, 28.f, 22.f, 24.f, 17.f, 24.f, 12.f, 27.f, 10.f, 24.f, 5.f, 24.f, 0.f, 27.f, 0.f, 35.f, - 0.f, 47.f, 7.f, 49.f, 12.f, 48.f, 18.f, 48.f, 23.f, 44.f, 25.f, 55.f, 27.f, 48.f, 32.f, 44.f, 33.f, 44.f, 37.f, 47.f, 44.f, 44.f, 45.f, 44.f, 49.f, 47.f, 55.f, 55.f, 59.f, 45.f, 70.f, 42.f, 77.f, 45.f, 82.f, 45.f, 90.f, 55.f, - 1.f, 65.f, 9.f, 65.f, 14.f, 62.f, 22.f, 65.f, 30.f, 75.f, - 1.f, 85.f, 12.f, 82.f, 19.f, 85.f, 24.f, 85.f, 32.f, 95.f, 37.f, 85.f, 45.f, 85.f, 50.f, 82.f, 58.f, 85.f, 66.f, 95.f, 69.f, 87.f, 76.f, 89.f, 81.f, 88.f, 87.f, 88.f, 92.f, 84.f, 94.f, 95.f, - 0.f, 108.f, 5.f, 104.f, 6.f, 104.f, 10.f, 107.f, 17.f, 104.f, 18.f, 104.f, 22.f, 107.f, 30.f, 113.f - }; + float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); - - ReLayoutRightToLeftLinesData data = + AlignData data = { - "Paragraphs with right to left text.", - "שלום עולם مرحبا بالعالم\n" - "مرحبا بالعالم שלום עולם\n" - "שלום עולם مرحبا بالعالم.", + "Begin alignment for the first paragraph.", + "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - 72u, - positions, + Text::HorizontalAlignment::BEGIN, + Text::VerticalAlignment::TOP, 0u, - 24u + 22u, + 6u, + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; - if( !ReLayoutRightToLeftLinesTest( data ) ) + if( !AlignTest( data ) ) { tet_result(TET_FAIL); } @@ -3652,23 +3888,24 @@ int UtcDaliTextReorderLayout02(void) END_TEST; } -int UtcDaliTextReorderLayout03(void) +int UtcDaliTextAlign02(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextReorderLayout03"); + tet_infoline(" UtcDaliTextAlign02"); - // Reorder lines of the mid paragraph. + // Calculate text alignment. + const std::string fontLatin( "TizenSans" ); const std::string fontHebrew( "TizenSansHebrew" ); const std::string fontArabic( "TizenSansArabic" ); // Set a known font description FontDescriptionRun fontDescriptionRun01; fontDescriptionRun01.characterRun.characterIndex = 0u; - fontDescriptionRun01.characterRun.numberOfCharacters = 10u; - fontDescriptionRun01.familyLength = fontHebrew.size(); + fontDescriptionRun01.characterRun.numberOfCharacters = 12u; + fontDescriptionRun01.familyLength = fontLatin.size(); fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength]; - memcpy( fontDescriptionRun01.familyName, fontHebrew.c_str(), fontDescriptionRun01.familyLength ); + memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength ); fontDescriptionRun01.familyDefined = true; fontDescriptionRun01.weightDefined = false; fontDescriptionRun01.widthDefined = false; @@ -3676,11 +3913,11 @@ int UtcDaliTextReorderLayout03(void) fontDescriptionRun01.sizeDefined = false; FontDescriptionRun fontDescriptionRun02; - fontDescriptionRun02.characterRun.characterIndex = 10u; - fontDescriptionRun02.characterRun.numberOfCharacters = 14u; - fontDescriptionRun02.familyLength = fontArabic.size(); + fontDescriptionRun02.characterRun.characterIndex = 12u; + fontDescriptionRun02.characterRun.numberOfCharacters = 10u; + fontDescriptionRun02.familyLength = fontHebrew.size(); fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength]; - memcpy( fontDescriptionRun02.familyName, fontArabic.c_str(), fontDescriptionRun02.familyLength ); + memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength ); fontDescriptionRun02.familyDefined = true; fontDescriptionRun02.weightDefined = false; fontDescriptionRun02.widthDefined = false; @@ -3688,7 +3925,7 @@ int UtcDaliTextReorderLayout03(void) fontDescriptionRun02.sizeDefined = false; FontDescriptionRun fontDescriptionRun03; - fontDescriptionRun03.characterRun.characterIndex = 24u; + fontDescriptionRun03.characterRun.characterIndex = 22u; fontDescriptionRun03.characterRun.numberOfCharacters = 14u; fontDescriptionRun03.familyLength = fontArabic.size(); fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength]; @@ -3700,11 +3937,11 @@ int UtcDaliTextReorderLayout03(void) fontDescriptionRun03.sizeDefined = false; FontDescriptionRun fontDescriptionRun04; - fontDescriptionRun04.characterRun.characterIndex = 38u; - fontDescriptionRun04.characterRun.numberOfCharacters = 10u; - fontDescriptionRun04.familyLength = fontHebrew.size(); + fontDescriptionRun04.characterRun.characterIndex = 36u; + fontDescriptionRun04.characterRun.numberOfCharacters = 12u; + fontDescriptionRun04.familyLength = fontLatin.size(); fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength]; - memcpy( fontDescriptionRun04.familyName, fontHebrew.c_str(), fontDescriptionRun04.familyLength ); + memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength ); fontDescriptionRun04.familyDefined = true; fontDescriptionRun04.weightDefined = false; fontDescriptionRun04.widthDefined = false; @@ -3713,10 +3950,10 @@ int UtcDaliTextReorderLayout03(void) FontDescriptionRun fontDescriptionRun05; fontDescriptionRun05.characterRun.characterIndex = 48u; - fontDescriptionRun05.characterRun.numberOfCharacters = 10u; - fontDescriptionRun05.familyLength = fontHebrew.size(); + fontDescriptionRun05.characterRun.numberOfCharacters = 12u; + fontDescriptionRun05.familyLength = fontLatin.size(); fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength]; - memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength ); + memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength ); fontDescriptionRun05.familyDefined = true; fontDescriptionRun05.weightDefined = false; fontDescriptionRun05.widthDefined = false; @@ -3724,8 +3961,8 @@ int UtcDaliTextReorderLayout03(void) fontDescriptionRun05.sizeDefined = false; FontDescriptionRun fontDescriptionRun06; - fontDescriptionRun06.characterRun.characterIndex = 58u; - fontDescriptionRun06.characterRun.numberOfCharacters = 15u; + fontDescriptionRun06.characterRun.characterIndex = 60u; + fontDescriptionRun06.characterRun.numberOfCharacters = 14u; fontDescriptionRun06.familyLength = fontArabic.size(); fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength]; memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength ); @@ -3743,34 +3980,27 @@ int UtcDaliTextReorderLayout03(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = - { - 1.f, 5.f, 12.f, 2.f, 19.f, 5.f, 24.f, 5.f, 32.f, 15.f, 37.f, 5.f, 45.f, 5.f, 50.f, 2.f, 58.f, 5.f, 66.f, 15.f, 69.f, 7.f, 76.f, 9.f, 81.f, 8.f, 87.f, 8.f, 92.f, 4.f, 94.f, 15.f, - 0.f, 28.f, 5.f, 24.f, 6.f, 24.f, 10.f, 27.f, 17.f, 24.f, 18.f, 24.f, 22.f, 27.f, 28.f, 35.f, - 86.f, 47.f, 81.f, 49.f, 74.f, 48.f, 71.f, 48.f, 70.f, 44.f, 66.f, 55.f, 62.f, 48.f, 61.f, 44.f, 56.f, 44.f, 51.f, 47.f, 49.f, 44.f, 44.f, 44.f, 39.f, 47.f, 36.f, 55.f, 26.f, 45.f, 18.f, 42.f, 13.f, 45.f, 5.f, 45.f, 0.f, 55.f, - 22.f, 65.f, 17.f, 65.f, 10.f, 62.f, 1.f, 65.f, 0.f, 75.f, - 1.f, 85.f, 12.f, 82.f, 19.f, 85.f, 24.f, 85.f, 32.f, 95.f, 37.f, 85.f, 45.f, 85.f, 50.f, 82.f, 58.f, 85.f, 66.f, 95.f, 69.f, 87.f, 76.f, 89.f, 81.f, 88.f, 87.f, 88.f, 92.f, 84.f, 94.f, 95.f, - 0.f, 108.f, 5.f, 104.f, 6.f, 104.f, 10.f, 107.f, 17.f, 104.f, 18.f, 104.f, 22.f, 107.f, 30.f, 113.f - }; + float positions[] = { 0.f, 0.f, 33.f, 19.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); - - ReLayoutRightToLeftLinesData data = + AlignData data = { - "Paragraphs with right to left text.", - "שלום עולם مرحبا بالعالم\n" - "مرحبا بالعالم שלום עולם\n" - "שלום עולם مرحبا بالعالم.", + "Begin alignment for the mid paragraph.", + "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - 72u, + Text::HorizontalAlignment::BEGIN, + Text::VerticalAlignment::TOP, + 22u, + 26u, + 6u, positions, - 24u, - 24u + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; - if( !ReLayoutRightToLeftLinesTest( data ) ) + if( !AlignTest( data ) ) { tet_result(TET_FAIL); } @@ -3779,23 +4009,24 @@ int UtcDaliTextReorderLayout03(void) END_TEST; } -int UtcDaliTextReorderLayout04(void) +int UtcDaliTextAlign03(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextReorderLayout04"); + tet_infoline(" UtcDaliTextAlign03"); - // Reorder lines of the last paragraph. + // Calculate text alignment. + const std::string fontLatin( "TizenSans" ); const std::string fontHebrew( "TizenSansHebrew" ); const std::string fontArabic( "TizenSansArabic" ); // Set a known font description FontDescriptionRun fontDescriptionRun01; fontDescriptionRun01.characterRun.characterIndex = 0u; - fontDescriptionRun01.characterRun.numberOfCharacters = 10u; - fontDescriptionRun01.familyLength = fontHebrew.size(); + fontDescriptionRun01.characterRun.numberOfCharacters = 12u; + fontDescriptionRun01.familyLength = fontLatin.size(); fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength]; - memcpy( fontDescriptionRun01.familyName, fontHebrew.c_str(), fontDescriptionRun01.familyLength ); + memcpy( fontDescriptionRun01.familyName, fontLatin.c_str(), fontDescriptionRun01.familyLength ); fontDescriptionRun01.familyDefined = true; fontDescriptionRun01.weightDefined = false; fontDescriptionRun01.widthDefined = false; @@ -3803,11 +4034,11 @@ int UtcDaliTextReorderLayout04(void) fontDescriptionRun01.sizeDefined = false; FontDescriptionRun fontDescriptionRun02; - fontDescriptionRun02.characterRun.characterIndex = 10u; - fontDescriptionRun02.characterRun.numberOfCharacters = 14u; - fontDescriptionRun02.familyLength = fontArabic.size(); + fontDescriptionRun02.characterRun.characterIndex = 12u; + fontDescriptionRun02.characterRun.numberOfCharacters = 10u; + fontDescriptionRun02.familyLength = fontHebrew.size(); fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength]; - memcpy( fontDescriptionRun02.familyName, fontArabic.c_str(), fontDescriptionRun02.familyLength ); + memcpy( fontDescriptionRun02.familyName, fontHebrew.c_str(), fontDescriptionRun02.familyLength ); fontDescriptionRun02.familyDefined = true; fontDescriptionRun02.weightDefined = false; fontDescriptionRun02.widthDefined = false; @@ -3815,7 +4046,7 @@ int UtcDaliTextReorderLayout04(void) fontDescriptionRun02.sizeDefined = false; FontDescriptionRun fontDescriptionRun03; - fontDescriptionRun03.characterRun.characterIndex = 24u; + fontDescriptionRun03.characterRun.characterIndex = 22u; fontDescriptionRun03.characterRun.numberOfCharacters = 14u; fontDescriptionRun03.familyLength = fontArabic.size(); fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength]; @@ -3827,11 +4058,11 @@ int UtcDaliTextReorderLayout04(void) fontDescriptionRun03.sizeDefined = false; FontDescriptionRun fontDescriptionRun04; - fontDescriptionRun04.characterRun.characterIndex = 38u; - fontDescriptionRun04.characterRun.numberOfCharacters = 10u; - fontDescriptionRun04.familyLength = fontHebrew.size(); + fontDescriptionRun04.characterRun.characterIndex = 36u; + fontDescriptionRun04.characterRun.numberOfCharacters = 12u; + fontDescriptionRun04.familyLength = fontLatin.size(); fontDescriptionRun04.familyName = new char[fontDescriptionRun04.familyLength]; - memcpy( fontDescriptionRun04.familyName, fontHebrew.c_str(), fontDescriptionRun04.familyLength ); + memcpy( fontDescriptionRun04.familyName, fontLatin.c_str(), fontDescriptionRun04.familyLength ); fontDescriptionRun04.familyDefined = true; fontDescriptionRun04.weightDefined = false; fontDescriptionRun04.widthDefined = false; @@ -3840,10 +4071,10 @@ int UtcDaliTextReorderLayout04(void) FontDescriptionRun fontDescriptionRun05; fontDescriptionRun05.characterRun.characterIndex = 48u; - fontDescriptionRun05.characterRun.numberOfCharacters = 10u; - fontDescriptionRun05.familyLength = fontHebrew.size(); + fontDescriptionRun05.characterRun.numberOfCharacters = 12u; + fontDescriptionRun05.familyLength = fontLatin.size(); fontDescriptionRun05.familyName = new char[fontDescriptionRun05.familyLength]; - memcpy( fontDescriptionRun05.familyName, fontHebrew.c_str(), fontDescriptionRun05.familyLength ); + memcpy( fontDescriptionRun05.familyName, fontLatin.c_str(), fontDescriptionRun05.familyLength ); fontDescriptionRun05.familyDefined = true; fontDescriptionRun05.weightDefined = false; fontDescriptionRun05.widthDefined = false; @@ -3851,8 +4082,8 @@ int UtcDaliTextReorderLayout04(void) fontDescriptionRun05.sizeDefined = false; FontDescriptionRun fontDescriptionRun06; - fontDescriptionRun06.characterRun.characterIndex = 58u; - fontDescriptionRun06.characterRun.numberOfCharacters = 15u; + fontDescriptionRun06.characterRun.characterIndex = 60u; + fontDescriptionRun06.characterRun.numberOfCharacters = 14u; fontDescriptionRun06.familyLength = fontArabic.size(); fontDescriptionRun06.familyName = new char[fontDescriptionRun06.familyLength]; memcpy( fontDescriptionRun06.familyName, fontArabic.c_str(), fontDescriptionRun06.familyLength ); @@ -3870,34 +4101,27 @@ int UtcDaliTextReorderLayout04(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = - { - 1.f, 5.f, 12.f, 2.f, 19.f, 5.f, 24.f, 5.f, 32.f, 15.f, 37.f, 5.f, 45.f, 5.f, 50.f, 2.f, 58.f, 5.f, 66.f, 15.f, 69.f, 7.f, 76.f, 9.f, 81.f, 8.f, 87.f, 8.f, 92.f, 4.f, 94.f, 15.f, - 0.f, 28.f, 5.f, 24.f, 6.f, 24.f, 10.f, 27.f, 17.f, 24.f, 18.f, 24.f, 22.f, 27.f, 28.f, 35.f, - 0.f, 47.f, 7.f, 49.f, 12.f, 48.f, 18.f, 48.f, 23.f, 44.f, 25.f, 55.f, 27.f, 48.f, 32.f, 44.f, 33.f, 44.f, 37.f, 47.f, 44.f, 44.f, 45.f, 44.f, 49.f, 47.f, 55.f, 55.f, 59.f, 45.f, 70.f, 42.f, 77.f, 45.f, 82.f, 45.f, 90.f, 55.f, - 1.f, 65.f, 9.f, 65.f, 14.f, 62.f, 22.f, 65.f, 30.f, 75.f, - 87.f, 85.f, 79.f, 82.f, 74.f, 85.f, 66.f, 85.f, 61.f, 95.f, 53.f, 85.f, 48.f, 85.f, 41.f, 82.f, 32.f, 85.f, 27.f, 95.f, 20.f, 87.f, 15.f, 89.f, 8.f, 88.f, 5.f, 88.f, 4.f, 84.f, 0.f, 95.f, - 28.f, 108.f, 27.f, 104.f, 22.f, 104.f, 17.f, 107.f, 15.f, 104.f, 10.f, 104.f, 5.f, 107.f, 2.f, 113.f - }; + float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); - - ReLayoutRightToLeftLinesData data = + AlignData data = { - "Paragraphs with right to left text.", - "שלום עולם مرحبا بالعالم\n" - "مرحبا بالعالم שלום עולם\n" - "שלום עולם مرحبا بالعالم.", + "Begin alignment for the last paragraph.", + "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - 72u, - positions, + Text::HorizontalAlignment::BEGIN, + Text::VerticalAlignment::TOP, 48u, - 24u + 26u, + 6u, + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; - if( !ReLayoutRightToLeftLinesTest( data ) ) + if( !AlignTest( data ) ) { tet_result(TET_FAIL); } @@ -3906,10 +4130,10 @@ int UtcDaliTextReorderLayout04(void) END_TEST; } -int UtcDaliTextAlign01(void) +int UtcDaliTextAlign04(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign01"); + tet_infoline(" UtcDaliTextAlign04"); // Calculate text alignment. @@ -3998,22 +4222,24 @@ int UtcDaliTextAlign01(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; + float positions[] = { 9.f, 15.f, 0.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "Begin alignment for the first paragraph.", + "Center alignment for the first paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_BEGIN, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::CENTER, + Text::VerticalAlignment::TOP, 0u, 22u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; if( !AlignTest( data ) ) @@ -4025,10 +4251,10 @@ int UtcDaliTextAlign01(void) END_TEST; } -int UtcDaliTextAlign02(void) +int UtcDaliTextAlign05(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign02"); + tet_infoline(" UtcDaliTextAlign05"); // Calculate text alignment. @@ -4117,22 +4343,24 @@ int UtcDaliTextAlign02(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, 2.f, 60.f, 0.f, 0.f }; + float positions[] = { 0.f, 0.f, 14.f, 9.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "Begin alignment for the mid paragraph.", + "Center alignment for the mid paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_BEGIN, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::CENTER, + Text::VerticalAlignment::TOP, 22u, 26u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; if( !AlignTest( data ) ) @@ -4144,10 +4372,10 @@ int UtcDaliTextAlign02(void) END_TEST; } -int UtcDaliTextAlign03(void) +int UtcDaliTextAlign06(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign03"); + tet_infoline(" UtcDaliTextAlign06"); // Calculate text alignment. @@ -4236,22 +4464,24 @@ int UtcDaliTextAlign03(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; + float positions[] = { 0.f, 0.f, 0.f, 0.f, 9.f, 17.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "Begin alignment for the last paragraph.", + "Center alignment for the last paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_BEGIN, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::CENTER, + Text::VerticalAlignment::TOP, 48u, 26u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; if( !AlignTest( data ) ) @@ -4263,10 +4493,10 @@ int UtcDaliTextAlign03(void) END_TEST; } -int UtcDaliTextAlign04(void) +int UtcDaliTextAlign07(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign04"); + tet_infoline(" UtcDaliTextAlign07"); // Calculate text alignment. @@ -4355,22 +4585,24 @@ int UtcDaliTextAlign04(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 10.f, 16.f, 0.f, 0.f, 0.f, 0.f }; + float positions[] = { 19.f, 31.f, 0.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "Center alignment for the first paragraph.", + "End alignment for the first paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_CENTER, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::END, + Text::VerticalAlignment::TOP, 0u, 22u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; if( !AlignTest( data ) ) @@ -4382,10 +4614,10 @@ int UtcDaliTextAlign04(void) END_TEST; } -int UtcDaliTextAlign05(void) +int UtcDaliTextAlign08(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign05"); + tet_infoline(" UtcDaliTextAlign08"); // Calculate text alignment. @@ -4474,22 +4706,24 @@ int UtcDaliTextAlign05(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, -1.f, 30.f, 0.f, 0.f }; + float positions[] = { 0.f, 0.f, -4.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "Center alignment for the mid paragraph.", + "End alignment for the mid paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_CENTER, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::END, + Text::VerticalAlignment::TOP, 22u, 26u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; if( !AlignTest( data ) ) @@ -4501,10 +4735,10 @@ int UtcDaliTextAlign05(void) END_TEST; } -int UtcDaliTextAlign06(void) +int UtcDaliTextAlign09(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign06"); + tet_infoline(" UtcDaliTextAlign09"); // Calculate text alignment. @@ -4593,22 +4827,24 @@ int UtcDaliTextAlign06(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, 0.f, 0.f, 10.f, 20.f }; + float positions[] = { 0.f, 0.f, 0.f, 0.f, 19.f, 34.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "Center alignment for the last paragraph.", + "End alignment for the last paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_CENTER, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::END, + Text::VerticalAlignment::TOP, 48u, 26u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + false }; if( !AlignTest( data ) ) @@ -4620,10 +4856,10 @@ int UtcDaliTextAlign06(void) END_TEST; } -int UtcDaliTextAlign07(void) +int UtcDaliTextAlign10(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign07"); + tet_infoline(" UtcDaliTextAlign10"); // Calculate text alignment. @@ -4712,22 +4948,24 @@ int UtcDaliTextAlign07(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 20.f, 33.f, 0.f, 0.f, 0.f, 0.f }; + float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "End alignment for the first paragraph.", + "Begin alignment for the first paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_END, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::END, + Text::VerticalAlignment::TOP, 0u, 22u, 6u, - positions + positions, + Dali::LayoutDirection::RIGHT_TO_LEFT, + true }; if( !AlignTest( data ) ) @@ -4739,10 +4977,10 @@ int UtcDaliTextAlign07(void) END_TEST; } -int UtcDaliTextAlign08(void) +int UtcDaliTextAlign11(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign08"); + tet_infoline(" UtcDaliTextAlign11"); // Calculate text alignment. @@ -4831,22 +5069,24 @@ int UtcDaliTextAlign08(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, -4.f, 0.f, 0.f, 0.f }; + float positions[] = { 19.f, 31.f, 33.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "End alignment for the mid paragraph.", + "End alignment for the last paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_END, - LayoutEngine::VERTICAL_ALIGN_TOP, - 22u, + Text::HorizontalAlignment::END, + Text::VerticalAlignment::TOP, + 0u, 26u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + true }; if( !AlignTest( data ) ) @@ -4858,10 +5098,10 @@ int UtcDaliTextAlign08(void) END_TEST; } -int UtcDaliTextAlign09(void) +int UtcDaliTextAlign12(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliTextAlign09"); + tet_infoline(" UtcDaliTextAlign12"); // Calculate text alignment. @@ -4950,22 +5190,24 @@ int UtcDaliTextAlign09(void) fontDescriptionRuns.PushBack( fontDescriptionRun05 ); fontDescriptionRuns.PushBack( fontDescriptionRun06 ); - float positions[] = { 0.f, 0.f, 0.f, 0.f, 20.f, 40.f }; + float positions[] = { 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; Size textArea( 100.f, 300.f ); AlignData data = { - "End alignment for the last paragraph.", + "Begin alignment for the first paragraph.", "Hello world שלום עולם\nمرحبا بالعالم Hello world\nHello world مرحبا بالعالم.", textArea, 6u, fontDescriptionRuns.Begin(), - LayoutEngine::HORIZONTAL_ALIGN_END, - LayoutEngine::VERTICAL_ALIGN_TOP, + Text::HorizontalAlignment::BEGIN, + Text::VerticalAlignment::TOP, 48u, 26u, 6u, - positions + positions, + Dali::LayoutDirection::LEFT_TO_RIGHT, + true }; if( !AlignTest( data ) ) @@ -4976,3 +5218,212 @@ int UtcDaliTextAlign09(void) tet_result(TET_PASS); END_TEST; } + +int UtcDaliTextLayoutSetGetDefaultLineSpacing(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliTextLayoutSetGetDefaultLineSpacing"); + + Layout::Engine engine; + DALI_TEST_EQUALS( 0.f, engine.GetDefaultLineSpacing(), Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + + engine.SetDefaultLineSpacing( 10.f ); + DALI_TEST_EQUALS( 10.f, engine.GetDefaultLineSpacing(), Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + + tet_result(TET_PASS); + END_TEST; +} + +int UtcDaliTextLayoutGetGlyphMetrics(void) +{ + tet_infoline(" UtcDaliTextLayoutGetGlyphMetrics"); + + // Test retrieving metrics from group of characters + + const std::string fontFamily( "TizenSansHindi" ); + + // Set a known font description + FontDescriptionRun fontDescriptionRun01; + fontDescriptionRun01.characterRun.characterIndex = 0u; + fontDescriptionRun01.characterRun.numberOfCharacters = 2u; + fontDescriptionRun01.familyLength = fontFamily.size(); + fontDescriptionRun01.familyName = new char[fontDescriptionRun01.familyLength]; + memcpy( fontDescriptionRun01.familyName, fontFamily.c_str(), fontDescriptionRun01.familyLength ); + fontDescriptionRun01.familyDefined = true; + fontDescriptionRun01.weightDefined = false; + fontDescriptionRun01.widthDefined = false; + fontDescriptionRun01.slantDefined = false; + fontDescriptionRun01.sizeDefined = false; + + // Set a known font description + FontDescriptionRun fontDescriptionRun02; + fontDescriptionRun02.characterRun.characterIndex = 0u; + fontDescriptionRun02.characterRun.numberOfCharacters = 2u; + fontDescriptionRun02.familyLength = fontFamily.size(); + fontDescriptionRun02.familyName = new char[fontDescriptionRun02.familyLength]; + memcpy( fontDescriptionRun02.familyName, fontFamily.c_str(), fontDescriptionRun02.familyLength ); + fontDescriptionRun02.familyDefined = true; + fontDescriptionRun02.weightDefined = false; + fontDescriptionRun02.widthDefined = false; + fontDescriptionRun02.slantDefined = false; + fontDescriptionRun02.sizeDefined = false; + + // Set a known font description + FontDescriptionRun fontDescriptionRun03; + fontDescriptionRun03.characterRun.characterIndex = 0u; + fontDescriptionRun03.characterRun.numberOfCharacters = 2u; + fontDescriptionRun03.familyLength = fontFamily.size(); + fontDescriptionRun03.familyName = new char[fontDescriptionRun03.familyLength]; + memcpy( fontDescriptionRun03.familyName, fontFamily.c_str(), fontDescriptionRun03.familyLength ); + fontDescriptionRun03.familyDefined = true; + fontDescriptionRun03.weightDefined = false; + fontDescriptionRun03.widthDefined = false; + fontDescriptionRun03.slantDefined = false; + fontDescriptionRun03.sizeDefined = false; + + Vector fontDescriptionRuns01; + fontDescriptionRuns01.PushBack( fontDescriptionRun01 ); + + Vector fontDescriptionRuns02; + fontDescriptionRuns02.PushBack( fontDescriptionRun02 ); + + Vector fontDescriptionRuns03; + fontDescriptionRuns03.PushBack( fontDescriptionRun03 ); + + // Set a text area. + Size textArea(100.f, 100.f); + + + // Group: second glyph doesn't exceed the width of the first glyph + float positions01[] = { 0.f, -11.f }; + + struct LineRun line01 = + { + { 0u, 1u }, + { 0u, 1u }, + 11.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + false, + false + }; + Vector lines01; + lines01.PushBack( line01 ); + + Size layoutSize01 = Vector2(11.f, 19.f); + + // Group: second glyph doesn't exceed the width of the first glyph + float positions02[] = { 0.f, -11.f, 7.f, -15.f, }; + + struct LineRun line02 = + { + { 0u, 2u }, + { 0u, 2u }, + 16.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + false, + false + }; + Vector lines02; + lines02.PushBack( line02 ); + + Size layoutSize02 = Vector2(16.f, 19.f); + + // Group: second glyph doesn't exceed the width of the first glyph + float positions03[] = { 0.f, -11.f , 2.f, -15.f }; + + struct LineRun line03 = + { + { 0u, 2u }, + { 0u, 2u }, + 11.f, + 15.f, + -4.f, + 0.f, + 0.f, + 0.f, + false, + false + }; + Vector lines03; + lines03.PushBack( line03 ); + + Size layoutSize03 = Vector2(11.f, 19.f); + + ///////////////////////////// + + struct LayoutTextData data[] = + { + { + "Single glyph", + "प", + textArea, + 1u, + fontDescriptionRuns01.Begin(), + layoutSize01, + 1u, + positions01, + 1u, + lines01.Begin(), + Layout::Engine::SINGLE_LINE_BOX, + 0u, + 1u, + false, + true + }, + { + "Group: second glyph exceeds the width of the first glyph", + "पो", + textArea, + 1u, + fontDescriptionRuns02.Begin(), + layoutSize02, + 2u, + positions02, + 1u, + lines02.Begin(), + Layout::Engine::SINGLE_LINE_BOX, + 0u, + 2u, + false, + true + }, + { + "Group: second glyph doesn't exceed the width of the first glyph", + "पे", + textArea, + 1u, + fontDescriptionRuns03.Begin(), + layoutSize03, + 2u, + positions03, + 1u, + lines03.Begin(), + Layout::Engine::SINGLE_LINE_BOX, + 0u, + 2u, + false, + true + } + }; + const unsigned int numberOfTests = sizeof(data)/sizeof(LayoutTextData); + + for( unsigned int index = 0u; index < numberOfTests; ++index ) + { + ToolkitTestApplication application; + if( !LayoutTextTest( data[index] ) ) + { + tet_result(TET_FAIL); + } + } + + tet_result(TET_PASS); + END_TEST; +}