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=af257ff31efddc9b64500fbb227ec540598e5af7;hp=148ff583769e1a1443c8ff0fd459bd1729e8f8a2;hb=a49a044e847e3b6d3734519c41098e200cd12d5d;hpb=534e542d7dcc1a1507a0e5e6845d49c06a15d326 diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index 148ff58..af257ff 100644 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,7 +70,8 @@ struct LineLayout extraWidth( 0.f ), wsLengthEndOfLine( 0.f ), ascender( 0.f ), - descender( MAX_FLOAT ) + descender( MAX_FLOAT ), + lineSpacing( 0.f ) {} ~LineLayout() @@ -100,6 +101,7 @@ struct LineLayout 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. + float lineSpacing; ///< The line spacing }; struct Engine::Impl @@ -107,7 +109,8 @@ struct Engine::Impl Impl() : mLayout( Layout::Engine::SINGLE_LINE_BOX ), mCursorWidth( CURSOR_WIDTH ), - mDefaultLineSpacing( LINE_SPACING ) + mDefaultLineSpacing( LINE_SPACING ), + mPreviousCharacterExtraWidth( 0.0f ) { } @@ -133,6 +136,9 @@ struct Engine::Impl { lineLayout.descender = fontMetrics.descender; } + + // set the line spacing + lineLayout.lineSpacing = mDefaultLineSpacing; } /** @@ -198,6 +204,7 @@ struct Engine::Impl LineLayout tmpLineLayout; const bool isMultiline = mLayout == MULTI_LINE_BOX; + const bool isWordLaidOut = parameters.lineWrapMode == Text::LineWrap::WORD; // The last glyph to be laid-out. const GlyphIndex lastGlyphOfParagraphPlusOne = parameters.startGlyphIndex + parameters.numberOfGlyphs; @@ -339,6 +346,7 @@ struct Engine::Impl const float extraWidth = glyphMetrics.xBearing + glyphMetrics.width - glyphMetrics.advance; tmpExtraWidth = ( 0.f < extraWidth ) ? extraWidth : 0.f; + tmpExtraWidth = std::max( mPreviousCharacterExtraWidth - glyphMetrics.advance, tmpExtraWidth ); } } else @@ -352,6 +360,7 @@ struct Engine::Impl const float extraWidth = glyphMetrics.xBearing + glyphMetrics.width - glyphMetrics.advance; tmpExtraWidth = ( 0.f < extraWidth ) ? extraWidth : 0.f; + tmpExtraWidth = std::max( mPreviousCharacterExtraWidth - glyphMetrics.advance, tmpExtraWidth ); } else // LTR { @@ -379,6 +388,7 @@ struct Engine::Impl const float extraWidth = glyphMetrics.xBearing + glyphMetrics.width - glyphMetrics.advance; tmpExtraWidth = ( 0.f < extraWidth ) ? extraWidth : 0.f; + tmpExtraWidth = std::max( mPreviousCharacterExtraWidth - glyphMetrics.advance, tmpExtraWidth ); } } } @@ -387,6 +397,9 @@ struct Engine::Impl tmpLineLayout.wsLengthEndOfLine = 0.f; } + // Save the current extra width to compare with the next one + mPreviousCharacterExtraWidth = tmpExtraWidth; + // Check if the accumulated length fits in the width of the box. if( ( completelyFill || isMultiline ) && !isWhiteSpace && ( tmpExtraBearing + lineLayout.length + lineLayout.wsLengthEndOfLine + tmpLineLayout.length + tmpExtraWidth > parameters.boundingBox.width ) ) @@ -447,7 +460,7 @@ struct Engine::Impl if( isMultiline && ( TextAbstraction::WORD_BREAK == wordBreakInfo ) ) { - oneWordLaidOut = true; + oneWordLaidOut = isWordLaidOut; DALI_LOG_INFO( gLogFilter, Debug::Verbose, " One word laid-out\n" ); // Current glyph is the last one of the current word. @@ -469,6 +482,7 @@ struct Engine::Impl void SetGlyphPositions( const GlyphInfo* const glyphsBuffer, Length numberOfGlyphs, + float outlineWidth, Vector2* glyphPositionsBuffer ) { // Traverse the glyphs and set the positions. @@ -478,7 +492,8 @@ struct Engine::Impl // 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; + float penX = ( 0.f > glyph.xBearing ) ? -glyph.xBearing + outlineWidth : outlineWidth; + for( GlyphIndex i = 0u; i < numberOfGlyphs; ++i ) { @@ -565,7 +580,7 @@ struct Engine::Impl // Get the last line and layout it again with the 'completelyFill' flag to true. lineRun = linesBuffer + ( numberOfLines - 1u ); - penY -= layout.ascender - lineRun->descender; + penY -= layout.ascender - lineRun->descender + lineRun->lineSpacing; ellipsisLayout.glyphIndex = lineRun->glyphRun.glyphIndex; } @@ -598,11 +613,12 @@ struct Engine::Impl layoutSize.width = layoutParameters.boundingBox.width; if( layoutSize.height < Math::MACHINE_EPSILON_1000 ) { - layoutSize.height += ( lineRun->ascender + -lineRun->descender ); + layoutSize.height += ( lineRun->ascender + -lineRun->descender ) + lineRun->lineSpacing; } SetGlyphPositions( layoutParameters.glyphsBuffer + lineRun->glyphRun.glyphIndex, ellipsisLayout.numberOfGlyphs, + layoutParameters.outlineWidth, glyphPositionsBuffer + lineRun->glyphRun.glyphIndex - layoutParameters.startGlyphIndex ); } @@ -635,6 +651,8 @@ struct Engine::Impl lineRun.glyphRun.numberOfGlyphs = layout.numberOfGlyphs; lineRun.characterRun.characterIndex = layout.characterIndex; lineRun.characterRun.numberOfCharacters = layout.numberOfCharacters; + lineRun.lineSpacing = mDefaultLineSpacing; + if( isLastLine && !layoutParameters.isLastNewParagraph ) { const float width = layout.extraBearing + layout.length + layout.extraWidth + layout.wsLengthEndOfLine; @@ -665,7 +683,7 @@ struct Engine::Impl layoutSize.width = lineRun.width; } - layoutSize.height += ( lineRun.ascender + -lineRun.descender ); + layoutSize.height += ( lineRun.ascender + -lineRun.descender ) + lineRun.lineSpacing; } /** @@ -705,8 +723,9 @@ struct Engine::Impl lineRun.alignmentOffset = 0.f; lineRun.direction = !RTL; lineRun.ellipsis = false; + lineRun.lineSpacing = mDefaultLineSpacing; - layoutSize.height += ( lineRun.ascender + -lineRun.descender ); + layoutSize.height += ( lineRun.ascender + -lineRun.descender ) + lineRun.lineSpacing; } /** @@ -730,7 +749,7 @@ struct Engine::Impl layoutSize.width = line.width; } - layoutSize.height += ( line.ascender + -line.descender ); + layoutSize.height += ( line.ascender + -line.descender ) + line.lineSpacing; } } @@ -962,10 +981,11 @@ struct Engine::Impl // Sets the positions of the glyphs. SetGlyphPositions( layoutParameters.glyphsBuffer + index, layout.numberOfGlyphs, + layoutParameters.outlineWidth, glyphPositionsBuffer + index - layoutParameters.startGlyphIndex ); // Updates the vertical pen's position. - penY += -layout.descender; + penY += -layout.descender + layout.lineSpacing + mDefaultLineSpacing; // Increase the glyph index. index = nextIndex; @@ -1042,7 +1062,7 @@ struct Engine::Impl const CharacterIndex characterVisualIndex = bidiLine.characterRun.characterIndex + *bidiLine.visualToLogicalMap; const GlyphInfo& glyph = *( layoutParameters.glyphsBuffer + *( layoutParameters.charactersToGlyphsBuffer + characterVisualIndex ) ); - float penX = ( 0.f > glyph.xBearing ) ? -glyph.xBearing : 0.f; + float penX = ( 0.f > glyph.xBearing ) ? -glyph.xBearing - layoutParameters.outlineWidth : -layoutParameters.outlineWidth; Vector2* glyphPositionsBuffer = glyphPositions.Begin(); @@ -1077,11 +1097,13 @@ struct Engine::Impl void Align( const Size& size, CharacterIndex startIndex, Length numberOfCharacters, - HorizontalAlignment horizontalAlignment, - Vector& lines ) + Text::HorizontalAlignment::Type horizontalAlignment, + Vector& lines, + float& alignmentOffset ) { const CharacterIndex lastCharacterPlusOne = startIndex + numberOfCharacters; + alignmentOffset = MAX_FLOAT; // Traverse all lines and align the glyphs. for( Vector::Iterator it = lines.Begin(), endIt = lines.End(); it != endIt; @@ -1106,36 +1128,39 @@ struct Engine::Impl CalculateHorizontalAlignment( size.width, horizontalAlignment, line ); + + // Updates the alignment offset. + alignmentOffset = std::min( alignmentOffset, line.alignmentOffset ); } } void CalculateHorizontalAlignment( float boxWidth, - HorizontalAlignment horizontalAlignment, + HorizontalAlignment::Type horizontalAlignment, LineRun& line ) { line.alignmentOffset = 0.f; const bool isRTL = RTL == line.direction; float lineLength = line.width; - HorizontalAlignment alignment = horizontalAlignment; + HorizontalAlignment::Type alignment = horizontalAlignment; if( isRTL ) { // Swap the alignment type if the line is right to left. switch( alignment ) { - case HORIZONTAL_ALIGN_BEGIN: + case HorizontalAlignment::BEGIN: { - alignment = HORIZONTAL_ALIGN_END; + alignment = HorizontalAlignment::END; break; } - case HORIZONTAL_ALIGN_CENTER: + case HorizontalAlignment::CENTER: { // Nothing to do. break; } - case HORIZONTAL_ALIGN_END: + case HorizontalAlignment::END: { - alignment = HORIZONTAL_ALIGN_BEGIN; + alignment = HorizontalAlignment::BEGIN; break; } } @@ -1144,7 +1169,7 @@ struct Engine::Impl // Calculate the horizontal line offset. switch( alignment ) { - case HORIZONTAL_ALIGN_BEGIN: + case HorizontalAlignment::BEGIN: { line.alignmentOffset = 0.f; @@ -1155,7 +1180,7 @@ struct Engine::Impl } break; } - case HORIZONTAL_ALIGN_CENTER: + case HorizontalAlignment::CENTER: { line.alignmentOffset = 0.5f * ( boxWidth - lineLength ); @@ -1167,7 +1192,7 @@ struct Engine::Impl line.alignmentOffset = floorf( line.alignmentOffset ); // try to avoid pixel alignment. break; } - case HORIZONTAL_ALIGN_END: + case HorizontalAlignment::END: { if( isRTL ) { @@ -1193,11 +1218,13 @@ struct Engine::Impl line.alignmentOffset = 0.f; line.direction = !RTL; line.ellipsis = false; + line.lineSpacing = mDefaultLineSpacing; } Type mLayout; float mCursorWidth; float mDefaultLineSpacing; + float mPreviousCharacterExtraWidth; IntrusivePtr mMetrics; }; @@ -1266,14 +1293,16 @@ void Engine::ReLayoutRightToLeftLines( const Parameters& layoutParameters, void Engine::Align( const Size& size, CharacterIndex startIndex, Length numberOfCharacters, - Layout::HorizontalAlignment horizontalAlignment, - Vector& lines ) + Text::HorizontalAlignment::Type horizontalAlignment, + Vector& lines, + float& alignmentOffset ) { mImpl->Align( size, startIndex, numberOfCharacters, horizontalAlignment, - lines ); + lines, + alignmentOffset ); } void Engine::SetDefaultLineSpacing( float lineSpacing )