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=4ace75b8d90b25afe728548ab59983d96853d6a7;hp=717c7525a917d33394c164e651b9050f66816d98;hb=87ee192bc7f97c78faea025484fc90ac231cfd81;hpb=a0bc72c2530d445a843cc0ad5dbe047f1f6c0883 diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index 717c752..4ace75b 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. @@ -38,6 +38,9 @@ namespace Toolkit namespace Text { +namespace Layout +{ + namespace { @@ -67,7 +70,8 @@ struct LineLayout extraWidth( 0.f ), wsLengthEndOfLine( 0.f ), ascender( 0.f ), - descender( MAX_FLOAT ) + descender( MAX_FLOAT ), + lineSpacing( 0.f ) {} ~LineLayout() @@ -97,17 +101,16 @@ 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 LayoutEngine::Impl +struct Engine::Impl { Impl() - : mLayout( LayoutEngine::SINGLE_LINE_BOX ), - mHorizontalAlignment( LayoutEngine::HORIZONTAL_ALIGN_BEGIN ), - mVerticalAlignment( LayoutEngine::VERTICAL_ALIGN_TOP ), + : mLayout( Layout::Engine::SINGLE_LINE_BOX ), mCursorWidth( CURSOR_WIDTH ), mDefaultLineSpacing( LINE_SPACING ), - mEllipsisEnabled( false ) + mPreviousCharacterExtraWidth( 0.0f ) { } @@ -133,6 +136,9 @@ struct LayoutEngine::Impl { lineLayout.descender = fontMetrics.descender; } + + // set the line spacing + lineLayout.lineSpacing = mDefaultLineSpacing; } /** @@ -187,7 +193,7 @@ struct LayoutEngine::Impl * @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, + void GetLineLayoutForBox( const Parameters& parameters, LineLayout& lineLayout, CharacterDirection& paragraphDirection, bool completelyFill ) @@ -198,6 +204,7 @@ struct LayoutEngine::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; @@ -274,9 +281,6 @@ struct LayoutEngine::Impl // Get the line break info for the current character. const LineBreakInfo lineBreakInfo = hasCharacters ? *( parameters.lineBreakInfoBuffer + characterLastIndex ) : TextAbstraction::LINE_NO_BREAK; - // Get the word break info for the current character. - const WordBreakInfo wordBreakInfo = *( parameters.wordBreakInfoBuffer + characterLastIndex ); - // Increase the number of characters. tmpLineLayout.numberOfCharacters += charactersPerGlyph; @@ -339,6 +343,7 @@ struct LayoutEngine::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 +357,7 @@ struct LayoutEngine::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 +385,7 @@ struct LayoutEngine::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 +394,9 @@ struct LayoutEngine::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 ) ) @@ -445,9 +455,9 @@ struct LayoutEngine::Impl } if( isMultiline && - ( TextAbstraction::WORD_BREAK == wordBreakInfo ) ) + ( TextAbstraction::LINE_ALLOW_BREAK == lineBreakInfo ) ) { - 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 +479,7 @@ struct LayoutEngine::Impl void SetGlyphPositions( const GlyphInfo* const glyphsBuffer, Length numberOfGlyphs, + float outlineWidth, Vector2* glyphPositionsBuffer ) { // Traverse the glyphs and set the positions. @@ -478,7 +489,8 @@ struct LayoutEngine::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 ) { @@ -538,7 +550,7 @@ struct LayoutEngine::Impl * * return Whether the line is ellipsized. */ - bool EllipsisLine( const LayoutParameters& layoutParameters, + bool EllipsisLine( const Parameters& layoutParameters, const LineLayout& layout, Size& layoutSize, LineRun* linesBuffer, @@ -565,7 +577,7 @@ struct LayoutEngine::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 +610,12 @@ struct LayoutEngine::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 ); } @@ -620,7 +633,7 @@ struct LayoutEngine::Impl * @param[in,out] numberOfLines The number of laid-out lines. * @param[in] isLastLine Whether the laid-out line is the last one. */ - void UpdateTextLayout( const LayoutParameters& layoutParameters, + void UpdateTextLayout( const Parameters& layoutParameters, const LineLayout& layout, Size& layoutSize, LineRun* linesBuffer, @@ -635,6 +648,8 @@ struct LayoutEngine::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 +680,7 @@ struct LayoutEngine::Impl layoutSize.width = lineRun.width; } - layoutSize.height += ( lineRun.ascender + -lineRun.descender ); + layoutSize.height += ( lineRun.ascender + -lineRun.descender ) + lineRun.lineSpacing; } /** @@ -678,7 +693,7 @@ struct LayoutEngine::Impl * @param[in,out] linesBuffer Pointer to the line's buffer. * @param[in,out] numberOfLines The number of laid-out lines. */ - void UpdateTextLayout( const LayoutParameters& layoutParameters, + void UpdateTextLayout( const Parameters& layoutParameters, CharacterIndex characterIndex, GlyphIndex glyphIndex, Size& layoutSize, @@ -705,8 +720,9 @@ struct LayoutEngine::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 +746,7 @@ struct LayoutEngine::Impl layoutSize.width = line.width; } - layoutSize.height += ( line.ascender + -line.descender ); + layoutSize.height += ( line.ascender + -line.descender ) + line.lineSpacing; } } @@ -742,7 +758,7 @@ struct LayoutEngine::Impl * @param[in] characterOffset The offset to be added to the runs of characters. * @param[in] glyphOffset The offset to be added to the runs of glyphs. */ - void UpdateLineIndexOffsets( const LayoutParameters& layoutParameters, + void UpdateLineIndexOffsets( const Parameters& layoutParameters, Vector& lines, Length characterOffset, Length glyphOffset ) @@ -763,10 +779,11 @@ struct LayoutEngine::Impl } } - bool LayoutText( const LayoutParameters& layoutParameters, + bool LayoutText( const Parameters& layoutParameters, Vector& glyphPositions, Vector& lines, - Size& layoutSize ) + Size& layoutSize, + bool elideTextEnabled ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->LayoutText\n" ); DALI_LOG_INFO( gLogFilter, Debug::Verbose, " box size %f, %f\n", layoutParameters.boundingBox.width, layoutParameters.boundingBox.height ); @@ -890,7 +907,7 @@ struct LayoutEngine::Impl DALI_LOG_INFO( gLogFilter, Debug::Verbose, " pen y %f\n", penY ); bool ellipsis = false; - if( mEllipsisEnabled ) + if( elideTextEnabled ) { // Does the ellipsis of the last line. ellipsis = EllipsisLine( layoutParameters, @@ -961,10 +978,11 @@ struct LayoutEngine::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; @@ -1014,7 +1032,7 @@ struct LayoutEngine::Impl return true; } - void ReLayoutRightToLeftLines( const LayoutParameters& layoutParameters, + void ReLayoutRightToLeftLines( const Parameters& layoutParameters, CharacterIndex startIndex, Length numberOfCharacters, Vector& glyphPositions ) @@ -1041,7 +1059,7 @@ struct LayoutEngine::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(); @@ -1076,10 +1094,13 @@ struct LayoutEngine::Impl void Align( const Size& size, CharacterIndex startIndex, Length numberOfCharacters, - 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; @@ -1102,36 +1123,41 @@ struct LayoutEngine::Impl // Calculate the line's alignment offset accordingly with the align option, // the box width, line length, and the paragraph's direction. CalculateHorizontalAlignment( size.width, + horizontalAlignment, line ); + + // Updates the alignment offset. + alignmentOffset = std::min( alignmentOffset, line.alignmentOffset ); } } void CalculateHorizontalAlignment( float boxWidth, + HorizontalAlignment::Type horizontalAlignment, LineRun& line ) { line.alignmentOffset = 0.f; const bool isRTL = RTL == line.direction; float lineLength = line.width; - HorizontalAlignment alignment = mHorizontalAlignment; + 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; } } @@ -1140,7 +1166,7 @@ struct LayoutEngine::Impl // Calculate the horizontal line offset. switch( alignment ) { - case HORIZONTAL_ALIGN_BEGIN: + case HorizontalAlignment::BEGIN: { line.alignmentOffset = 0.f; @@ -1151,7 +1177,7 @@ struct LayoutEngine::Impl } break; } - case HORIZONTAL_ALIGN_CENTER: + case HorizontalAlignment::CENTER: { line.alignmentOffset = 0.5f * ( boxWidth - lineLength ); @@ -1163,7 +1189,7 @@ struct LayoutEngine::Impl line.alignmentOffset = floorf( line.alignmentOffset ); // try to avoid pixel alignment. break; } - case HORIZONTAL_ALIGN_END: + case HorizontalAlignment::END: { if( isRTL ) { @@ -1189,102 +1215,71 @@ struct LayoutEngine::Impl line.alignmentOffset = 0.f; line.direction = !RTL; line.ellipsis = false; + line.lineSpacing = mDefaultLineSpacing; } - LayoutEngine::Layout mLayout; - LayoutEngine::HorizontalAlignment mHorizontalAlignment; - LayoutEngine::VerticalAlignment mVerticalAlignment; + Type mLayout; float mCursorWidth; float mDefaultLineSpacing; + float mPreviousCharacterExtraWidth; IntrusivePtr mMetrics; - - bool mEllipsisEnabled:1; }; -LayoutEngine::LayoutEngine() +Engine::Engine() : mImpl( NULL ) { - mImpl = new LayoutEngine::Impl(); + mImpl = new Engine::Impl(); } -LayoutEngine::~LayoutEngine() +Engine::~Engine() { delete mImpl; } -void LayoutEngine::SetMetrics( MetricsPtr& metrics ) +void Engine::SetMetrics( MetricsPtr& metrics ) { mImpl->mMetrics = metrics; } -void LayoutEngine::SetLayout( Layout layout ) +void Engine::SetLayout( Type layout ) { mImpl->mLayout = layout; } -LayoutEngine::Layout LayoutEngine::GetLayout() const +Engine::Type Engine::GetLayout() const { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "GetLayout[%d]\n", mImpl->mLayout); return mImpl->mLayout; } -void LayoutEngine::SetTextEllipsisEnabled( bool enabled ) -{ - DALI_LOG_INFO( gLogFilter, Debug::General, "-->LayoutEngine::SetTextEllipsisEnabled[%s]\n", (enabled)?"true":"false" ); - mImpl->mEllipsisEnabled = enabled; -} - -bool LayoutEngine::GetTextEllipsisEnabled() const -{ - return mImpl->mEllipsisEnabled; -} - -void LayoutEngine::SetHorizontalAlignment( HorizontalAlignment alignment ) -{ - mImpl->mHorizontalAlignment = alignment; -} - -LayoutEngine::HorizontalAlignment LayoutEngine::GetHorizontalAlignment() const -{ - return mImpl->mHorizontalAlignment; -} - -void LayoutEngine::SetVerticalAlignment( VerticalAlignment alignment ) -{ - mImpl->mVerticalAlignment = alignment; -} - -LayoutEngine::VerticalAlignment LayoutEngine::GetVerticalAlignment() const -{ - return mImpl->mVerticalAlignment; -} - -void LayoutEngine::SetCursorWidth( int width ) +void Engine::SetCursorWidth( int width ) { mImpl->mCursorWidth = static_cast( width ); } -int LayoutEngine::GetCursorWidth() const +int Engine::GetCursorWidth() const { return static_cast( mImpl->mCursorWidth ); } -bool LayoutEngine::LayoutText( const LayoutParameters& layoutParameters, - Vector& glyphPositions, - Vector& lines, - Size& layoutSize ) +bool Engine::LayoutText( const Parameters& layoutParameters, + Vector& glyphPositions, + Vector& lines, + Size& layoutSize, + bool elideTextEnabled ) { return mImpl->LayoutText( layoutParameters, glyphPositions, lines, - layoutSize ); + layoutSize, + elideTextEnabled ); } -void LayoutEngine::ReLayoutRightToLeftLines( const LayoutParameters& layoutParameters, - CharacterIndex startIndex, - Length numberOfCharacters, - Vector& glyphPositions ) +void Engine::ReLayoutRightToLeftLines( const Parameters& layoutParameters, + CharacterIndex startIndex, + Length numberOfCharacters, + Vector& glyphPositions ) { mImpl->ReLayoutRightToLeftLines( layoutParameters, startIndex, @@ -1292,27 +1287,33 @@ void LayoutEngine::ReLayoutRightToLeftLines( const LayoutParameters& layoutParam glyphPositions ); } -void LayoutEngine::Align( const Size& size, - CharacterIndex startIndex, - Length numberOfCharacters, - Vector& lines ) +void Engine::Align( const Size& size, + CharacterIndex startIndex, + Length numberOfCharacters, + Text::HorizontalAlignment::Type horizontalAlignment, + Vector& lines, + float& alignmentOffset ) { mImpl->Align( size, startIndex, numberOfCharacters, - lines ); + horizontalAlignment, + lines, + alignmentOffset ); } -void LayoutEngine::SetDefaultLineSpacing( float lineSpacing ) +void Engine::SetDefaultLineSpacing( float lineSpacing ) { mImpl->mDefaultLineSpacing = lineSpacing; } -float LayoutEngine::GetDefaultLineSpacing() const +float Engine::GetDefaultLineSpacing() const { return mImpl->mDefaultLineSpacing; } +} // namespace Layout + } // namespace Text } // namespace Toolkit