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=01a57868f488dc55c9404d4ed518dfa17575e188;hp=15894466122cb537cd08c212e3febd59d28ffdec;hb=6599e9e422766947f932e4e77dd4ff1de040209d;hpb=c62063a98f6870f4ba10ef6945a9ced75eeced0e diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index 1589446..01a5786 100644 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include // INTERNAL INCLUDES @@ -60,7 +60,8 @@ struct LineLayout numberOfGlyphs( 0u ), numberOfCharacters( 0u ), length( 0.f ), - widthAdvanceDiff( 0.f ), + extraBearing( 0.f ), + extraWidth( 0.f ), wsLengthEndOfLine( 0.f ), ascender( 0.f ), descender( MAX_FLOAT ) @@ -76,7 +77,8 @@ struct LineLayout numberOfGlyphs = 0u; numberOfCharacters = 0u; length = 0.f; - widthAdvanceDiff = 0.f; + extraBearing = 0.f; + extraWidth = 0.f; wsLengthEndOfLine = 0.f; ascender = 0.f; descender = MAX_FLOAT; @@ -86,8 +88,9 @@ struct LineLayout CharacterIndex characterIndex; ///< Index of the first character to be laid-out. Length numberOfGlyphs; ///< The number of glyph which fit in one line. Length numberOfCharacters; ///< The number of characters which fit in one line. - float length; ///< The length of the glyphs which fit in one line. - float widthAdvanceDiff; ///< The difference between the xBearing + width and the advance of the last glyph. + float length; ///< The addition of the advance metric of all the glyphs which fit in one line. + float extraBearing; ///< The extra width to be added to the line's length when the bearing of the first glyph is negative. + float extraWidth; ///< The extra width to be added to the line's length when the bearing + width of the last glyph is greater than the advance. float wsLengthEndOfLine; ///< The length of the white spaces at the end of the line. float ascender; ///< The maximum ascender of all fonts in the line. float descender; ///< The minimum descender of all fonts in the line. @@ -98,7 +101,8 @@ struct LayoutEngine::Impl Impl() : mLayout( LayoutEngine::SINGLE_LINE_BOX ), mHorizontalAlignment( LayoutEngine::HORIZONTAL_ALIGN_BEGIN ), - mVerticalAlignment( LayoutEngine::VERTICAL_ALIGN_TOP ) + mVerticalAlignment( LayoutEngine::VERTICAL_ALIGN_TOP ), + mEllipsisEnabled( false ) { mFontClient = TextAbstraction::FontClient::Get(); } @@ -145,7 +149,6 @@ struct LayoutEngine::Impl lineLayout.length += lineLayout.wsLengthEndOfLine; lineLayout.wsLengthEndOfLine = tmpLineLayout.wsLengthEndOfLine; - lineLayout.widthAdvanceDiff = tmpLineLayout.widthAdvanceDiff; } else { @@ -165,9 +168,25 @@ struct LayoutEngine::Impl /** * Retrieves the line layout for a given box width. + * + * @note This method lais out text as it were left to right. At this point is not possible to reorder the line + * because the number of characters of the line is not known (one of the responsabilities of this method + * is calculate that). Due to glyph's 'x' bearing, width and advance, when right to left or mixed right to left + * and left to right text is laid out, it can be small differences in the line length. One solution is to + * reorder and re-lay out the text after this method and add or remove one extra glyph if needed. However, + * this method calculates which are the first and last glyphs of the line (the ones that causes the + * differences). This is a good point to check if there is problems with the text exceeding the boundaries + * of the control when there is right to left text. + * + * @param[in] parameters The layout parameters. + * @param[out] lineLayout The line layout. + * @param[in,out] paragraphDirection in: the current paragraph's direction, out: the next paragraph's direction. Is set after a must break. + * @param[in] completelyFill Whether to completely fill the line ( even if the last word exceeds the boundaries ). */ void GetLineLayoutForBox( const LayoutParameters& parameters, - LineLayout& lineLayout ) + LineLayout& lineLayout, + CharacterDirection& paragraphDirection, + bool completelyFill ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->GetLineLayoutForBox\n" ); DALI_LOG_INFO( gLogFilter, Debug::Verbose, " initial glyph index : %d\n", lineLayout.glyphIndex ); @@ -178,38 +197,26 @@ struct LayoutEngine::Impl const GlyphIndex lastGlyphIndex = parameters.totalNumberOfGlyphs - 1u; // If the first glyph has a negative bearing its absolute value needs to be added to the line length. - // In the case the line starts with a right to left character the bearing needs to be substracted to the line length. + // In the case the line starts with a right to left character, if the width is longer than the advance, + // the difference needs to be added to the line length. const GlyphInfo& glyphInfo = *( parameters.glyphsBuffer + lineLayout.glyphIndex ); - float initialHorizontalBearing = glyphInfo.xBearing; + // Set the direction of the first character of the line. lineLayout.characterIndex = *( parameters.glyphsToCharactersBuffer + lineLayout.glyphIndex ); const CharacterDirection firstCharacterDirection = ( NULL == parameters.characterDirectionBuffer ) ? false : *( parameters.characterDirectionBuffer + lineLayout.characterIndex ); + CharacterDirection previousCharacterDirection = firstCharacterDirection; - if( RTL == firstCharacterDirection ) - { - initialHorizontalBearing = -initialHorizontalBearing; + const float extraWidth = glyphInfo.xBearing + glyphInfo.width - glyphInfo.advance; + float tmpExtraWidth = ( 0.f < extraWidth ) ? extraWidth : 0.f; - if( 0.f < glyphInfo.xBearing ) - { - tmpLineLayout.length = glyphInfo.xBearing; - initialHorizontalBearing = 0.f; - } - } - else - { - if( 0.f > glyphInfo.xBearing ) - { - tmpLineLayout.length = -glyphInfo.xBearing; - initialHorizontalBearing = 0.f; - } - } + float tmpExtraBearing = ( 0.f > glyphInfo.xBearing ) ? -glyphInfo.xBearing : 0.f; + + tmpLineLayout.length += 1.f; // Added one unit to give some space to the cursor. // Calculate the line height if there is no characters. FontId lastFontId = glyphInfo.fontId; UpdateLineHeight( lastFontId, tmpLineLayout ); - const float boundingBoxWidth = parameters.boundingBox.width - initialHorizontalBearing; - bool oneWordLaidOut = false; for( GlyphIndex glyphIndex = lineLayout.glyphIndex; @@ -222,6 +229,14 @@ struct LayoutEngine::Impl // Get the glyph info. const GlyphInfo& glyphInfo = *( parameters.glyphsBuffer + glyphIndex ); + // Check if the font of the current glyph is the same of the previous one. + // If it's different the ascender and descender need to be updated. + if( lastFontId != glyphInfo.fontId ) + { + UpdateLineHeight( glyphInfo.fontId, tmpLineLayout ); + lastFontId = glyphInfo.fontId; + } + // Get the character indices for the current glyph. The last character index is needed // because there are glyphs formed by more than one character but their break info is // given only for the last character. @@ -247,7 +262,11 @@ struct LayoutEngine::Impl // Used to restore the temporal line layout when a single word does not fit in the control's width and is split by character. const float previousTmpLineLength = tmpLineLayout.length; - const float previousTmpWidthAdvanceDiff = tmpLineLayout.widthAdvanceDiff; + const float previousTmpExtraBearing = tmpExtraBearing; + const float previousTmpExtraWidth = tmpExtraWidth; + + // Get the character's direction. + const CharacterDirection characterDirection = ( NULL == parameters.characterDirectionBuffer ) ? false : *( parameters.characterDirectionBuffer + characterFirstIndex ); // Increase the accumulated length. if( isWhiteSpace ) @@ -259,13 +278,82 @@ struct LayoutEngine::Impl { // Add as well any previous white space length. tmpLineLayout.length += tmpLineLayout.wsLengthEndOfLine + glyphInfo.advance; - if( RTL == firstCharacterDirection ) + + // An extra space may be added to the line for the first and last glyph of the line. + // If the bearing of the first glyph is negative, its positive value needs to be added. + // If the bearing plus the width of the last glyph is greater than the advance, the difference + // needs to be added. + + if( characterDirection == paragraphDirection ) { - tmpLineLayout.widthAdvanceDiff = -glyphInfo.xBearing; + if( RTL == characterDirection ) + { + // <-- + // | Rrrrr| + // or + // | Rllrrr| + // or + // |lllrrrrr| + // | Rll| + // + + tmpExtraBearing = ( 0.f > glyphInfo.xBearing ) ? -glyphInfo.xBearing : 0.f; + } + else // LTR + { + // --> + // |lllL | + // or + // |llrrL | + // or + // |lllllrrr| + // |rrL | + // + + const float extraWidth = glyphInfo.xBearing + glyphInfo.width - glyphInfo.advance; + tmpExtraWidth = ( 0.f < extraWidth ) ? extraWidth : 0.f; + } } else { - tmpLineLayout.widthAdvanceDiff = glyphInfo.xBearing + glyphInfo.width - glyphInfo.advance; + if( characterDirection != previousCharacterDirection ) + { + if( RTL == characterDirection ) + { + // --> + // |lllR | + + const float extraWidth = glyphInfo.xBearing + glyphInfo.width - glyphInfo.advance; + tmpExtraWidth = ( 0.f < extraWidth ) ? extraWidth : 0.f; + } + else // LTR + { + // <-- + // | Lrrrr| + + tmpExtraBearing = ( 0.f > glyphInfo.xBearing ) ? -glyphInfo.xBearing : 0.f; + } + } + else if( characterDirection == firstCharacterDirection ) + { + if( RTL == characterDirection ) + { + // --> + // |llllllrr| + // |Rr | + + tmpExtraBearing = ( 0.f > glyphInfo.xBearing ) ? -glyphInfo.xBearing : 0.f; + } + else // LTR + { + // <-- + // |llllrrrr| + // | llL| + + const float extraWidth = glyphInfo.xBearing + glyphInfo.width - glyphInfo.advance; + tmpExtraWidth = ( 0.f < extraWidth ) ? extraWidth : 0.f; + } + } } // Clear the white space length at the end of the line. @@ -273,21 +361,22 @@ struct LayoutEngine::Impl } // Check if the accumulated length fits in the width of the box. - if( isMultiline && !isWhiteSpace && - ( lineLayout.length + lineLayout.wsLengthEndOfLine + tmpLineLayout.length + tmpLineLayout.widthAdvanceDiff > boundingBoxWidth ) ) + if( ( completelyFill || isMultiline ) && !isWhiteSpace && + ( tmpExtraBearing + lineLayout.length + lineLayout.wsLengthEndOfLine + tmpLineLayout.length + tmpExtraWidth > parameters.boundingBox.width ) ) { // Current word does not fit in the box's width. - if( !oneWordLaidOut ) + if( !oneWordLaidOut || completelyFill ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, " Break the word by character\n" ); // The word's with doesn't fit in the control's with. It needs to be split by character. - if( tmpLineLayout.numberOfGlyphs > 1u ) + if( tmpLineLayout.numberOfGlyphs > 0u ) { tmpLineLayout.numberOfCharacters -= charactersPerGlyph; --tmpLineLayout.numberOfGlyphs; tmpLineLayout.length = previousTmpLineLength; - tmpLineLayout.widthAdvanceDiff = previousTmpWidthAdvanceDiff; + tmpExtraBearing = previousTmpExtraBearing; + tmpExtraWidth = previousTmpExtraWidth; } // Add part of the word to the line layout. @@ -297,7 +386,12 @@ struct LayoutEngine::Impl { DALI_LOG_INFO( gLogFilter, Debug::Verbose, " Current word does not fit.\n" ); } - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--GetLineLayoutForBox\n" ); + + lineLayout.extraBearing = tmpExtraBearing; + lineLayout.extraWidth = tmpExtraWidth; + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--GetLineLayoutForBox.\n" ); + return; } @@ -307,6 +401,16 @@ struct LayoutEngine::Impl // Must break the line. Update the line layout and return. MergeLineLayout( lineLayout, tmpLineLayout ); + // Set the next paragraph's direction. + if( !isLastGlyph && + ( NULL != parameters.characterDirectionBuffer ) ) + { + paragraphDirection = *( parameters.characterDirectionBuffer + 1u + characterLastIndex ); + } + + lineLayout.extraBearing = tmpExtraBearing; + lineLayout.extraWidth = tmpExtraWidth; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " Must break\n" ); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--GetLineLayoutForBox\n" ); return; @@ -325,33 +429,65 @@ struct LayoutEngine::Impl tmpLineLayout.Clear(); } - // Check if the font of the current glyph is the same of the previous one. - // If it's different the ascender and descender need to be updated. - if( lastFontId != glyphInfo.fontId ) - { - UpdateLineHeight( glyphInfo.fontId, tmpLineLayout ); - lastFontId = glyphInfo.fontId; - } + previousCharacterDirection = characterDirection; } + + lineLayout.extraBearing = tmpExtraBearing; + lineLayout.extraWidth = tmpExtraWidth; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--GetLineLayoutForBox\n" ); } + void SetGlyphPositions( const GlyphInfo* const glyphsBuffer, + Length numberOfGlyphs, + float penY, + Vector2* glyphPositionsBuffer ) + { + // Traverse the glyphs and set the positions. + + // Check if the x bearing of the first character is negative. + // If it has a negative x bearing, it will exceed the boundaries of the actor, + // so the penX position needs to be moved to the right. + + const GlyphInfo& glyph = *glyphsBuffer; + float penX = ( 0.f > glyph.xBearing ) ? -glyph.xBearing : 0.f; + penX += 1.f; // Added one unit to give some space to the cursor. + + for( GlyphIndex i = 0u; i < numberOfGlyphs; ++i ) + { + const GlyphInfo& glyph = *( glyphsBuffer + i ); + Vector2& position = *( glyphPositionsBuffer + i ); + + position.x = penX + glyph.xBearing; + position.y = penY - glyph.yBearing; + + penX += glyph.advance; + } + } + bool LayoutText( const LayoutParameters& layoutParameters, Vector& glyphPositions, Vector& lines, Size& actualSize ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->LayoutText\n" ); - Vector2* glyphPositionsBuffer = glyphPositions.Begin(); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " box size %f, %f\n", layoutParameters.boundingBox.width, layoutParameters.boundingBox.height ); + + // Set the first paragraph's direction. + CharacterDirection paragraphDirection = ( NULL != layoutParameters.characterDirectionBuffer ) ? *layoutParameters.characterDirectionBuffer : !RTL; float penY = 0.f; for( GlyphIndex index = 0u; index < layoutParameters.totalNumberOfGlyphs; ) { + CharacterDirection currentParagraphDirection = paragraphDirection; + // Get the layout for the line. LineLayout layout; layout.glyphIndex = index; GetLineLayoutForBox( layoutParameters, - layout ); + layout, + paragraphDirection, + false ); DALI_LOG_INFO( gLogFilter, Debug::Verbose, " glyph index %d\n", layout.glyphIndex ); DALI_LOG_INFO( gLogFilter, Debug::Verbose, " character index %d\n", layout.characterIndex ); @@ -366,60 +502,132 @@ struct LayoutEngine::Impl return false; } - LineRun lineRun; - lineRun.glyphIndex = index; - lineRun.numberOfGlyphs = layout.numberOfGlyphs; - lineRun.characterRun.characterIndex = layout.characterIndex; - lineRun.characterRun.numberOfCharacters = layout.numberOfCharacters; - lineRun.width = layout.length + layout.widthAdvanceDiff; - lineRun.ascender = layout.ascender; - lineRun.descender = layout.descender; - lineRun.extraLength = layout.wsLengthEndOfLine > 0.f ? layout.wsLengthEndOfLine - layout.widthAdvanceDiff : 0.f; - lineRun.direction = false; - - lines.PushBack( lineRun ); - - // Update the actual size. - if( lineRun.width > actualSize.width ) + // Set the line position. Discard if ellipsis is enabled and the position exceeds the boundaries + // of the box. + penY += layout.ascender; + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " pen y %f\n", penY ); + if( mEllipsisEnabled && + ( ( penY - layout.descender > layoutParameters.boundingBox.height ) || + ( ( mLayout == SINGLE_LINE_BOX ) && + ( layout.extraBearing + layout.length + layout.extraWidth > layoutParameters.boundingBox.width ) ) ) ) { - actualSize.width = lineRun.width; - } + // Do not layout more lines if ellipsis is enabled. - actualSize.height += ( lineRun.ascender + -lineRun.descender ); + // The last line needs to be completely filled with characters. + // Part of a word may be used. - // Traverse the glyphs and set the positions. + const Length numberOfLines = lines.Count(); - penY += layout.ascender; + LineRun lineRun; + LineLayout ellipsisLayout; + if( 0u != numberOfLines ) + { + // Get the last line and layout it again with the 'completelyFill' flag to true. + lineRun = *( lines.Begin() + ( numberOfLines - 1u ) ); - // Check if the x bearing of the first character is negative. - // If it has a negative x bearing, it will exceed the boundaries of the actor, - // so the penX position needs to be moved to the right. - float penX = 0.f; + penY -= layout.ascender - lineRun.descender; - const GlyphInfo& glyph = *( layoutParameters.glyphsBuffer + index ); - if( 0.f > glyph.xBearing ) - { - penX = -glyph.xBearing; - } + ellipsisLayout.glyphIndex = lineRun.glyphIndex; + } + else + { + lineRun.glyphIndex = 0u; + ellipsisLayout.glyphIndex = 0u; + } - for( GlyphIndex i = index; i < index + layout.numberOfGlyphs; ++i ) + GetLineLayoutForBox( layoutParameters, + ellipsisLayout, + currentParagraphDirection, + true ); + + lineRun.numberOfGlyphs = ellipsisLayout.numberOfGlyphs; + lineRun.characterRun.characterIndex = ellipsisLayout.characterIndex; + lineRun.characterRun.numberOfCharacters = ellipsisLayout.numberOfCharacters; + lineRun.width = ellipsisLayout.length; + lineRun.extraLength = ( ellipsisLayout.wsLengthEndOfLine > 0.f ) ? ellipsisLayout.wsLengthEndOfLine - ellipsisLayout.extraWidth : 0.f; + lineRun.ascender = ellipsisLayout.ascender; + lineRun.descender = ellipsisLayout.descender; + lineRun.ellipsis = true; + + actualSize.width = layoutParameters.boundingBox.width; + actualSize.height += ( lineRun.ascender + -lineRun.descender ); + + SetGlyphPositions( layoutParameters.glyphsBuffer + lineRun.glyphIndex, + ellipsisLayout.numberOfGlyphs, + penY, + glyphPositions.Begin() + lineRun.glyphIndex ); + + if( 0u != numberOfLines ) + { + // Set the last line with the ellipsis layout. + *( lines.Begin() + ( numberOfLines - 1u ) ) = lineRun; + } + else + { + // Push the line. + lines.PushBack( lineRun ); + } + + break; + } + else { - const GlyphInfo& glyph = *( layoutParameters.glyphsBuffer + i ); - Vector2& position = *( glyphPositionsBuffer + i ); + const bool isLastLine = index + layout.numberOfGlyphs == layoutParameters.totalNumberOfGlyphs; + + LineRun lineRun; + lineRun.glyphIndex = index; + lineRun.numberOfGlyphs = layout.numberOfGlyphs; + lineRun.characterRun.characterIndex = layout.characterIndex; + lineRun.characterRun.numberOfCharacters = layout.numberOfCharacters; + if( isLastLine ) + { + const float width = layout.extraBearing + layout.length + layout.extraWidth + layout.wsLengthEndOfLine; + if( MULTI_LINE_BOX == mLayout ) + { + lineRun.width = ( width > layoutParameters.boundingBox.width ) ? layoutParameters.boundingBox.width : width; + } + else + { + lineRun.width = width; + } - position.x = penX + glyph.xBearing; - position.y = penY - glyph.yBearing; + lineRun.extraLength = 0.f; + } + else + { + lineRun.width = layout.extraBearing + layout.length + layout.extraWidth; + lineRun.extraLength = ( layout.wsLengthEndOfLine > 0.f ) ? layout.wsLengthEndOfLine - layout.extraWidth : 0.f; + } + lineRun.ascender = layout.ascender; + lineRun.descender = layout.descender; + lineRun.direction = false; + lineRun.ellipsis = false; - penX += glyph.advance; - } + lines.PushBack( lineRun ); + + // Update the actual size. + if( lineRun.width > actualSize.width ) + { + actualSize.width = lineRun.width; + } + + actualSize.height += ( lineRun.ascender + -lineRun.descender ); - penY += -layout.descender; + SetGlyphPositions( layoutParameters.glyphsBuffer + index, + layout.numberOfGlyphs, + penY, + glyphPositions.Begin() + index ); - // Increase the glyph index. - index += layout.numberOfGlyphs; + penY += -layout.descender; + + // Increase the glyph index. + index += layout.numberOfGlyphs; + } } DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--LayoutText\n\n" ); + return true; } @@ -431,12 +639,11 @@ struct LayoutEngine::Impl { const BidirectionalLineInfoRun& bidiLine = *( layoutParameters.lineBidirectionalInfoRunsBuffer + lineIndex ); - float penX = 0.f; - const CharacterIndex characterVisualIndex = bidiLine.characterRun.characterIndex + *bidiLine.visualToLogicalMap; const GlyphInfo& glyph = *( layoutParameters.glyphsBuffer + *( layoutParameters.charactersToGlyphsBuffer + characterVisualIndex ) ); - penX = -glyph.xBearing; + float penX = ( 0.f > glyph.xBearing ) ? -glyph.xBearing : 0.f; + penX += 1.f; // Added one unit to give some space to the cursor. Vector2* glyphPositionsBuffer = glyphPositions.Begin(); @@ -468,76 +675,36 @@ struct LayoutEngine::Impl } } - void Align( const LayoutParameters& layoutParameters, - const Size& layoutSize, - const Vector& lines, - Vector& glyphPositions ) + void Align( const Size& layoutSize, + Vector& lines ) { - Vector2* glyphPositionsBuffer = glyphPositions.Begin(); - // Traverse all lines and align the glyphs. - // LayoutParameters contains bidirectional info for those lines with - // right to left text, this info includes the paragraph's direction. - LineIndex bidiLineIndex = 0u; - for( Vector::ConstIterator it = lines.Begin(), endIt = lines.End(); + for( Vector::Iterator it = lines.Begin(), endIt = lines.End(); it != endIt; ++it ) { - const LineRun& line = *it; - - // 1) Get the paragrap's direction. - bool paragraphDirection = false; - - // Check if there is any right to left line. - if( ( NULL != layoutParameters.lineBidirectionalInfoRunsBuffer ) && - ( bidiLineIndex < layoutParameters.numberOfBidirectionalInfoRuns ) ) - { - const BidirectionalLineInfoRun* bidiLine = layoutParameters.lineBidirectionalInfoRunsBuffer + bidiLineIndex; - - // Get the right to left line that match with current line. - while( ( line.characterRun.characterIndex > bidiLine->characterRun.characterIndex ) && - ( bidiLineIndex < layoutParameters.numberOfBidirectionalInfoRuns ) ) - { - ++bidiLineIndex; - bidiLine = layoutParameters.lineBidirectionalInfoRunsBuffer + bidiLineIndex; - } - - if( line.characterRun.characterIndex == bidiLine->characterRun.characterIndex ) - { - paragraphDirection = bidiLine->direction; - } - } - - // 2) Calculate the alignment offset accordingly with the align option, - // the box width, line length, and the paragraphs direction. - float alignOffset = CalculateHorizontalAlignment( layoutSize.width, - line.width, - line.extraLength, - paragraphDirection ); - - // 3) Traverse all glyphs and update the 'x' position. - for( GlyphIndex index = line.glyphIndex, - endIndex = line.glyphIndex + line.numberOfGlyphs; - index < endIndex; - ++index ) - { - Vector2& position = *( glyphPositionsBuffer + index ); - - position.x += alignOffset; - } + LineRun& line = *it; + const bool isLastLine = lines.End() == it + 1u; + + // Calculate the alignment offset accordingly with the align option, + // the box width, line length, and the paragraphs direction. + CalculateHorizontalAlignment( layoutSize.width, + line, + isLastLine ); } } - float CalculateHorizontalAlignment( float boxWidth, - float lineLength, - float extraLength, - bool paragraphDirection ) + void CalculateHorizontalAlignment( float boxWidth, + LineRun& line, + bool isLastLine ) { - float offset = 0.f; + line.alignmentOffset = 0.f; + const bool isRTL = RTL == line.direction; + float lineLength = line.width; HorizontalAlignment alignment = mHorizontalAlignment; - if( paragraphDirection && + if( isRTL && ( HORIZONTAL_ALIGN_CENTER != alignment ) ) { if( HORIZONTAL_ALIGN_BEGIN == alignment ) @@ -554,29 +721,69 @@ struct LayoutEngine::Impl { case HORIZONTAL_ALIGN_BEGIN: { - offset = 0.f; + line.alignmentOffset = 0.f; + + if( isRTL ) + { + // 'Remove' the white spaces at the end of the line (which are at the beginning in visual order) + line.alignmentOffset -= line.extraLength; + + if( isLastLine ) + { + line.alignmentOffset += std::min( line.extraLength, boxWidth - lineLength ); + } + } break; } case HORIZONTAL_ALIGN_CENTER: { - offset = 0.5f * ( boxWidth - lineLength ); - const int intOffset = static_cast( offset ); // try to avoid pixel alignment. - offset = static_cast( intOffset ); + if( isLastLine && !isRTL ) + { + lineLength += line.extraLength; + if( lineLength > boxWidth ) + { + lineLength = boxWidth; + line.alignmentOffset = 0.f; + break; + } + } + + line.alignmentOffset = 0.5f * ( boxWidth - lineLength ); + + if( isRTL ) + { + line.alignmentOffset -= line.extraLength; + + if( isLastLine ) + { + line.alignmentOffset += 0.5f * std::min( line.extraLength, boxWidth - lineLength ); + } + } + + line.alignmentOffset = floorf( line.alignmentOffset ); // try to avoid pixel alignment. break; } case HORIZONTAL_ALIGN_END: { - offset = boxWidth - lineLength; + if( isLastLine && !isRTL ) + { + lineLength += line.extraLength; + if( lineLength > boxWidth ) + { + line.alignmentOffset = 0.f; + break; + } + } + + if( isRTL ) + { + lineLength += line.extraLength; + } + + line.alignmentOffset = boxWidth - lineLength; break; } } - - if( paragraphDirection ) - { - offset -= extraLength; - } - - return offset; } LayoutEngine::Layout mLayout; @@ -584,6 +791,8 @@ struct LayoutEngine::Impl LayoutEngine::VerticalAlignment mVerticalAlignment; TextAbstraction::FontClient mFontClient; + + bool mEllipsisEnabled:1; }; LayoutEngine::LayoutEngine() @@ -607,6 +816,16 @@ unsigned int LayoutEngine::GetLayout() const return mImpl->mLayout; } +void LayoutEngine::SetTextEllipsisEnabled( bool enabled ) +{ + mImpl->mEllipsisEnabled = enabled; +} + +bool LayoutEngine::GetTextEllipsisEnabled() const +{ + return mImpl->mEllipsisEnabled; +} + void LayoutEngine::SetHorizontalAlignment( HorizontalAlignment alignment ) { mImpl->mHorizontalAlignment = alignment; @@ -645,15 +864,11 @@ void LayoutEngine::ReLayoutRightToLeftLines( const LayoutParameters& layoutParam glyphPositions ); } -void LayoutEngine::Align( const LayoutParameters& layoutParameters, - const Size& layoutSize, - const Vector& lines, - Vector& glyphPositions ) +void LayoutEngine::Align( const Size& layoutSize, + Vector& lines ) { - mImpl->Align( layoutParameters, - layoutSize, - lines, - glyphPositions ); + mImpl->Align( layoutSize, + lines ); } } // namespace Text