X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Flayouts%2Flayout-engine.cpp;h=fa1e91969f56747fbec8c3f48157edd365e491d7;hp=460fb02847cc5d08bbd095040861e32dfb82ec21;hb=a117d2b75fc50a0e12ce7c5ffc1f6ad88c9fbc35;hpb=2e452b50f7b62e70b3c392898139049e261f3298 diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index 460fb02..fa1e919 100644 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -45,16 +45,18 @@ struct LineLayout Length numberOfCharacters; ///< The number of characters which fit in one line. Length numberOfGlyphs; ///< The number of glyph which fit in one line. float length; ///< The length of the glyphs which fit in one line. + float widthAdvanceDiff; ///< The difference between the width and the advance of the last glyph. float wsLengthEndOfLine; ///< The length of the white spaces at the end of the line. - float height; ///< The maximum height of all fonts in the line. float ascender; ///< The maximum ascender of all fonts in the line. + float descender; ///< The maximum descender of all fonts in the line. }; struct LayoutEngine::Impl { Impl() : mLayout( LayoutEngine::SINGLE_LINE_BOX ), - mAlignment( LayoutEngine::ALIGN_BEGIN ) + mHorizontalAlignment( LayoutEngine::HORIZONTAL_ALIGN_BEGIN ), + mVerticalAlignment( LayoutEngine::VERTICAL_ALIGN_TOP ) { mFontClient = TextAbstraction::FontClient::Get(); } @@ -70,8 +72,8 @@ struct LayoutEngine::Impl lineLayout.numberOfGlyphs = 0u; lineLayout.length = 0.f; lineLayout.wsLengthEndOfLine = 0.f; - lineLayout.height = 0.f; lineLayout.ascender = 0.f; + lineLayout.descender = 0.f; // Get the last glyph index. const GlyphIndex lastGlyphIndex = parameters.totalNumberOfGlyphs - 1u; @@ -121,18 +123,18 @@ struct LayoutEngine::Impl Text::FontMetrics fontMetrics; mFontClient.GetFontMetrics( glyphInfo.fontId, fontMetrics ); - // Sets the maximum height. - if( fontMetrics.height > lineLayout.height ) - { - lineLayout.height = fontMetrics.height; - } - // Sets the maximum ascender. if( fontMetrics.ascender > lineLayout.ascender ) { lineLayout.ascender = fontMetrics.ascender; } + // Sets the maximum descender. + if( fontMetrics.descender > lineLayout.descender ) + { + lineLayout.descender = fontMetrics.descender; + } + lastFontId = glyphInfo.fontId; } } @@ -148,21 +150,20 @@ struct LayoutEngine::Impl lineLayout.numberOfCharacters = 0u; lineLayout.numberOfGlyphs = 0u; lineLayout.length = 0.f; + lineLayout.widthAdvanceDiff = 0.f; lineLayout.wsLengthEndOfLine = 0.f; - lineLayout.height = 0.f; lineLayout.ascender = 0.f; + lineLayout.descender = 0.f; // Stores temporary line layout which has not been added to the final line layout. LineLayout tmpLineLayout; tmpLineLayout.numberOfCharacters = 0u; tmpLineLayout.numberOfGlyphs = 0u; tmpLineLayout.length = 0.f; + tmpLineLayout.widthAdvanceDiff = 0.f; tmpLineLayout.wsLengthEndOfLine = 0.f; - tmpLineLayout.height = 0.f; tmpLineLayout.ascender = 0.f; - - // Get the last glyph index. - const GlyphIndex lastGlyphIndex = parameters.totalNumberOfGlyphs - 1u; + tmpLineLayout.descender = 0.f; FontId lastFontId = 0u; for( GlyphIndex glyphIndex = lineLayout.glyphIndex; @@ -200,18 +201,20 @@ struct LayoutEngine::Impl { // Add the length to the length of white spaces at the end of the line. tmpLineLayout.wsLengthEndOfLine += glyphInfo.advance; // I use the advance as the width is always zero for the white spaces. + tmpLineLayout.widthAdvanceDiff = 0.f; } else { // Add as well any previous white space length. - tmpLineLayout.length += tmpLineLayout.wsLengthEndOfLine + ( glyphIndex == lastGlyphIndex ) ? glyphInfo.width : glyphInfo.advance; + tmpLineLayout.length += tmpLineLayout.wsLengthEndOfLine + glyphInfo.advance; + tmpLineLayout.widthAdvanceDiff = glyphInfo.width - glyphInfo.advance; // Clear the white space length at the end of the line. tmpLineLayout.wsLengthEndOfLine = 0.f; } // Check if the accumulated length fits in the width of the box. - if( lineLayout.length + tmpLineLayout.length + ( ( 0.f < tmpLineLayout.length ) ? lineLayout.wsLengthEndOfLine : 0.f ) > parameters.boundingBox.width ) + if( lineLayout.length + tmpLineLayout.length + tmpLineLayout.widthAdvanceDiff + ( ( 0.f < tmpLineLayout.length ) ? lineLayout.wsLengthEndOfLine : 0.f ) > parameters.boundingBox.width ) { // Current word does not fit in the box's width. return; @@ -219,41 +222,40 @@ struct LayoutEngine::Impl if( TextAbstraction::LINE_MUST_BREAK == lineBreakInfo ) { - if( glyphIndex == lastGlyphIndex ) + // Must break the line. Update the line layout and return. + lineLayout.numberOfCharacters += tmpLineLayout.numberOfCharacters; + lineLayout.numberOfGlyphs += tmpLineLayout.numberOfGlyphs; + lineLayout.length += tmpLineLayout.length; + lineLayout.widthAdvanceDiff = tmpLineLayout.widthAdvanceDiff; + + if( 0.f < tmpLineLayout.length ) + { + lineLayout.length += lineLayout.wsLengthEndOfLine; + + lineLayout.wsLengthEndOfLine = tmpLineLayout.wsLengthEndOfLine; + } + else + { + lineLayout.wsLengthEndOfLine += tmpLineLayout.wsLengthEndOfLine; + } + + if( tmpLineLayout.ascender > lineLayout.ascender ) + { + lineLayout.ascender = tmpLineLayout.ascender; + } + + if( tmpLineLayout.descender > lineLayout.descender ) { - // Must break the line. Update the line layout and return. - lineLayout.numberOfCharacters += tmpLineLayout.numberOfCharacters; - lineLayout.numberOfGlyphs += tmpLineLayout.numberOfGlyphs; - lineLayout.length += tmpLineLayout.length; - - if( 0.f < tmpLineLayout.length ) - { - lineLayout.length += lineLayout.wsLengthEndOfLine; - - lineLayout.wsLengthEndOfLine = tmpLineLayout.wsLengthEndOfLine; - } - else - { - lineLayout.wsLengthEndOfLine += tmpLineLayout.wsLengthEndOfLine; - } - - if( tmpLineLayout.height > lineLayout.height ) - { - lineLayout.height = tmpLineLayout.height; - } - - if( tmpLineLayout.ascender > lineLayout.ascender ) - { - lineLayout.ascender = tmpLineLayout.ascender; - } + lineLayout.descender = tmpLineLayout.descender; } tmpLineLayout.numberOfCharacters = 0u; tmpLineLayout.numberOfGlyphs = 0u; tmpLineLayout.length = 0u; + tmpLineLayout.widthAdvanceDiff = 0u; tmpLineLayout.wsLengthEndOfLine = 0u; - tmpLineLayout.height = 0.f; tmpLineLayout.ascender = 0.f; + tmpLineLayout.descender = 0.f; return; } @@ -264,6 +266,8 @@ struct LayoutEngine::Impl lineLayout.numberOfCharacters += tmpLineLayout.numberOfCharacters; lineLayout.numberOfGlyphs += tmpLineLayout.numberOfGlyphs; lineLayout.length += tmpLineLayout.length; + lineLayout.widthAdvanceDiff = tmpLineLayout.widthAdvanceDiff; + if( 0.f < tmpLineLayout.length ) { lineLayout.length += lineLayout.wsLengthEndOfLine; @@ -275,22 +279,23 @@ struct LayoutEngine::Impl lineLayout.wsLengthEndOfLine += tmpLineLayout.wsLengthEndOfLine; } - if( tmpLineLayout.height > lineLayout.height ) + if( tmpLineLayout.ascender > lineLayout.ascender ) { - lineLayout.height = tmpLineLayout.height; + lineLayout.ascender = tmpLineLayout.ascender; } - if( tmpLineLayout.ascender > lineLayout.ascender ) + if( tmpLineLayout.descender > lineLayout.descender ) { - lineLayout.ascender = tmpLineLayout.ascender; + lineLayout.descender = tmpLineLayout.descender; } tmpLineLayout.numberOfCharacters = 0u; tmpLineLayout.numberOfGlyphs = 0u; tmpLineLayout.length = 0u; + tmpLineLayout.widthAdvanceDiff = 0u; tmpLineLayout.wsLengthEndOfLine = 0u; - tmpLineLayout.height = 0.f; tmpLineLayout.ascender = 0.f; + tmpLineLayout.descender = 0.f; } if( lastFontId != glyphInfo.fontId ) @@ -298,18 +303,18 @@ struct LayoutEngine::Impl Text::FontMetrics fontMetrics; mFontClient.GetFontMetrics( glyphInfo.fontId, fontMetrics ); - // Sets the maximum height. - if( fontMetrics.height > tmpLineLayout.height ) - { - tmpLineLayout.height = fontMetrics.height; - } - // Sets the maximum ascender. if( fontMetrics.ascender > tmpLineLayout.ascender ) { tmpLineLayout.ascender = fontMetrics.ascender; } + // Sets the maximum descender. + if( -fontMetrics.descender > tmpLineLayout.descender ) + { + tmpLineLayout.descender = -fontMetrics.descender; + } + lastFontId = glyphInfo.fontId; } } @@ -351,14 +356,16 @@ struct LayoutEngine::Impl void ReLayoutRightToLeftLines( const LayoutParameters& layoutParameters, Vector& glyphPositions ) { + // Traverses the paragraphs with right to left characters. for( LineIndex lineIndex = 0u; lineIndex < layoutParameters.numberOfBidirectionalInfoRuns; ++lineIndex ) { - const BidirectionalLineInfoRun& bidiLine = *( layoutParameters.lineBidirectionalInfoRunsBuffer +lineIndex ); + const BidirectionalLineInfoRun& bidiLine = *( layoutParameters.lineBidirectionalInfoRunsBuffer + lineIndex ); float penX = 0.f; Vector2* glyphPositionsBuffer = glyphPositions.Begin(); + // Traverses the characters of the right to left paragraph. for( CharacterIndex characterLogicalIndex = 0u; characterLogicalIndex < bidiLine.characterRun.numberOfCharacters; ++characterLogicalIndex ) @@ -372,7 +379,9 @@ struct LayoutEngine::Impl for( GlyphIndex index = 0u; index < numberOfGlyphs; ++index ) { // Convert the character in the visual order into the glyph in the visual order. - GlyphIndex glyphIndex = 1u + *( layoutParameters.charactersToGlyphsBuffer + characterVisualIndex + index ) - numberOfGlyphs; + const GlyphIndex glyphIndex = *( layoutParameters.charactersToGlyphsBuffer + characterVisualIndex ) + index; + + DALI_ASSERT_DEBUG( 0u <= glyphIndex && glyphIndex < layoutParameters.totalNumberOfGlyphs ); const GlyphInfo& glyph = *( layoutParameters.glyphsBuffer + glyphIndex ); Vector2& position = *( glyphPositionsBuffer + glyphIndex ); @@ -385,6 +394,7 @@ struct LayoutEngine::Impl } void Align( const LayoutParameters& layoutParameters, + const Size& layoutSize, const Vector& lines, Vector& glyphPositions ) { @@ -426,10 +436,10 @@ struct LayoutEngine::Impl // 2) Calculate the alignment offset accordingly with the align option, // the box width, line length, and the paragraphs direction. - float alignOffset = CalculateAlignment( layoutParameters.boundingBox.width, - line.lineSize.width, - line.extraLength, - paragraphDirection ); + float alignOffset = CalculateHorizontalAlignment( layoutSize.width, + line.lineSize.width, + line.extraLength, + paragraphDirection ); // 3) Traverse all glyphs and update the 'x' position. for( GlyphIndex index = line.glyphIndex, @@ -463,17 +473,17 @@ struct LayoutEngine::Impl lineRun.characterRun.characterIndex = 0u; lineRun.characterRun.numberOfCharacters = *( layoutParameters.glyphsToCharactersBuffer + lastGlyphIndex ) + *( layoutParameters.charactersPerGlyphBuffer + lastGlyphIndex ); lineRun.lineSize.width = layout.length; - lineRun.lineSize.height = layout.height; + lineRun.lineSize.height = layout.ascender + layout.descender; lineRun.extraLength = layout.wsLengthEndOfLine; lines.PushBack( lineRun ); // Update the actual size. actualSize.width = layout.length; - actualSize.height = layout.height; + actualSize.height = lineRun.lineSize.height; float penX = 0.f; - float penY = layout.height; + float penY = layout.ascender; Vector2* glyphPositionsBuffer = glyphPositions.Begin(); for( GlyphIndex glyphIndex = 0u; glyphIndex < layout.numberOfGlyphs; ++glyphIndex ) @@ -520,23 +530,23 @@ struct LayoutEngine::Impl lineRun.numberOfGlyphs = layout.numberOfGlyphs; lineRun.characterRun.characterIndex = *( layoutParameters.glyphsToCharactersBuffer + index ); lineRun.characterRun.numberOfCharacters = ( *( layoutParameters.glyphsToCharactersBuffer + lastGlyphIndex ) + *( layoutParameters.charactersPerGlyphBuffer + lastGlyphIndex ) ) - lineRun.characterRun.characterIndex; - lineRun.lineSize.width = layout.length; - lineRun.lineSize.height = layout.height; + lineRun.lineSize.width = layout.length + ( ( layout.widthAdvanceDiff > 0.f ) ? layout.widthAdvanceDiff : 0.f ); + lineRun.lineSize.height = layout.ascender + layout.descender; lineRun.extraLength = layout.wsLengthEndOfLine; lines.PushBack( lineRun ); // Update the actual size. - if( layout.length > actualSize.width ) + if( layout.length + layout.widthAdvanceDiff > actualSize.width ) { actualSize.width = layout.length; } - actualSize.height += layout.height; + actualSize.height += lineRun.lineSize.height; // Traverse the glyphs and set the positions. - penY += layout.height; + penY += layout.ascender; Vector2* glyphPositionsBuffer = glyphPositions.Begin(); for( GlyphIndex i = index; i < index + layout.numberOfGlyphs; ++i ) @@ -550,6 +560,8 @@ struct LayoutEngine::Impl penX += glyph.advance; } + penY += layout.descender; + // Increase the glyph index. index += layout.numberOfGlyphs; } @@ -557,42 +569,42 @@ struct LayoutEngine::Impl return true; } - float CalculateAlignment( float boxWidth, - float lineLength, - float extraLength, - bool paragraphDirection ) + float CalculateHorizontalAlignment( float boxWidth, + float lineLength, + float extraLength, + bool paragraphDirection ) { float offset = 0.f; - Alignment alignment = mAlignment; + HorizontalAlignment alignment = mHorizontalAlignment; if( paragraphDirection && - ( ALIGN_CENTER != alignment ) ) + ( HORIZONTAL_ALIGN_CENTER != alignment ) ) { - if( ALIGN_BEGIN == alignment ) + if( HORIZONTAL_ALIGN_BEGIN == alignment ) { - alignment = ALIGN_END; + alignment = HORIZONTAL_ALIGN_END; } else { - alignment = ALIGN_BEGIN; + alignment = HORIZONTAL_ALIGN_BEGIN; } } switch( alignment ) { - case ALIGN_BEGIN: + case HORIZONTAL_ALIGN_BEGIN: { offset = 0.f; break; } - case ALIGN_CENTER: + case HORIZONTAL_ALIGN_CENTER: { offset = 0.5f * ( boxWidth - lineLength ); const int intOffset = static_cast( offset ); // try to avoid pixel alignment. offset = static_cast( intOffset ); break; } - case ALIGN_END: + case HORIZONTAL_ALIGN_END: { offset = boxWidth - lineLength; break; @@ -608,7 +620,8 @@ struct LayoutEngine::Impl } LayoutEngine::Layout mLayout; - LayoutEngine::Alignment mAlignment; + LayoutEngine::HorizontalAlignment mHorizontalAlignment; + LayoutEngine::VerticalAlignment mVerticalAlignment; TextAbstraction::FontClient mFontClient; }; @@ -634,14 +647,24 @@ unsigned int LayoutEngine::GetLayout() const return mImpl->mLayout; } -void LayoutEngine::SetAlignment( Alignment alignment ) +void LayoutEngine::SetHorizontalAlignment( HorizontalAlignment alignment ) +{ + mImpl->mHorizontalAlignment = alignment; +} + +LayoutEngine::HorizontalAlignment LayoutEngine::GetHorizontalAlignment() const +{ + return mImpl->mHorizontalAlignment; +} + +void LayoutEngine::SetVerticalAlignment( VerticalAlignment alignment ) { - mImpl->mAlignment = alignment; + mImpl->mVerticalAlignment = alignment; } -LayoutEngine::Alignment LayoutEngine::GetAlignment() const +LayoutEngine::VerticalAlignment LayoutEngine::GetVerticalAlignment() const { - return mImpl->mAlignment; + return mImpl->mVerticalAlignment; } bool LayoutEngine::LayoutText( const LayoutParameters& layoutParameters, @@ -663,10 +686,12 @@ void LayoutEngine::ReLayoutRightToLeftLines( const LayoutParameters& layoutParam } void LayoutEngine::Align( const LayoutParameters& layoutParameters, + const Size& layoutSize, const Vector& lines, Vector& glyphPositions ) { mImpl->Align( layoutParameters, + layoutSize, lines, glyphPositions ); }