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=ccd42aedec0ff89b6123060fdbd7e163b49a845f;hp=a5da5a4217236de67111bd002671fa1c5a2b2d9a;hb=6c456bd91c102985503b651e4734c5d82221c941;hpb=0e80c74336176c06765296302b7f9142c9dc1737 diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index a5da5a4..ccd42ae 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. @@ -25,6 +25,7 @@ // INTERNAL INCLUDES #include +#include #include #include @@ -37,6 +38,9 @@ namespace Toolkit namespace Text { +namespace Layout +{ + namespace { @@ -47,6 +51,7 @@ namespace const float MAX_FLOAT = std::numeric_limits::max(); const bool RTL = true; const float CURSOR_WIDTH = 1.f; +const float LINE_SPACING= 0.f; } //namespace @@ -97,14 +102,12 @@ struct LineLayout float descender; ///< The minimum descender of all fonts in the line. }; -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 ), - mEllipsisEnabled( false ) + mDefaultLineSpacing( LINE_SPACING ) { } @@ -184,7 +187,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 ) @@ -195,6 +198,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; @@ -444,7 +448,7 @@ struct LayoutEngine::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. @@ -464,36 +468,9 @@ struct LayoutEngine::Impl DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--GetLineLayoutForBox\n" ); } - /** - * @brief Calculates the vertical offset to add to the new laid-out glyphs. - * - * @pre @p lineIndex must be between 0 and the number of lines (both inclusive). - * - * @param[in] lines The previously laid-out lines. - * @param[in] lineIndex Index to the line where the new laid-out lines are inserted. - * - * @return The vertical offset of the lines starting from the beginning to the line @p lineIndex. - */ - float SetParagraphOffset( const Vector& lines, - LineIndex lineIndex ) - { - float offset = 0.f; - - for( Vector::ConstIterator it = lines.Begin(), - endIt = lines.Begin() + lineIndex; - it != endIt; - ++it ) - { - const LineRun& line = *it; - - offset += line.ascender + -line.descender; - } - - return offset; - } - void SetGlyphPositions( const GlyphInfo* const glyphsBuffer, Length numberOfGlyphs, + float outlineWidth, Vector2* glyphPositionsBuffer ) { // Traverse the glyphs and set the positions. @@ -503,7 +480,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 ) { @@ -563,7 +541,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, @@ -621,10 +599,14 @@ struct LayoutEngine::Impl lineRun->ellipsis = true; layoutSize.width = layoutParameters.boundingBox.width; - layoutSize.height += ( lineRun->ascender + -lineRun->descender ); + if( layoutSize.height < Math::MACHINE_EPSILON_1000 ) + { + layoutSize.height += ( lineRun->ascender + -lineRun->descender ); + } SetGlyphPositions( layoutParameters.glyphsBuffer + lineRun->glyphRun.glyphIndex, ellipsisLayout.numberOfGlyphs, + layoutParameters.outlineWidth, glyphPositionsBuffer + lineRun->glyphRun.glyphIndex - layoutParameters.startGlyphIndex ); } @@ -642,7 +624,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, @@ -700,7 +682,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, @@ -764,7 +746,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 ) @@ -785,10 +767,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 ); @@ -820,6 +803,10 @@ struct LayoutEngine::Impl } } + // Calculates the layout size. + UpdateLayoutSize( lines, + layoutSize ); + // Nothing else do if there are no glyphs to layout. return false; } @@ -871,8 +858,8 @@ struct LayoutEngine::Impl linesBuffer = lines.Begin(); } - float penY = SetParagraphOffset( lines, - layoutParameters.startLineIndex ); + float penY = CalculateLineOffset( lines, + layoutParameters.startLineIndex ); for( GlyphIndex index = layoutParameters.startGlyphIndex; index < lastGlyphPlusOne; ) { @@ -908,7 +895,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, @@ -979,6 +966,7 @@ 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. @@ -1032,7 +1020,7 @@ struct LayoutEngine::Impl return true; } - void ReLayoutRightToLeftLines( const LayoutParameters& layoutParameters, + void ReLayoutRightToLeftLines( const Parameters& layoutParameters, CharacterIndex startIndex, Length numberOfCharacters, Vector& glyphPositions ) @@ -1059,7 +1047,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(); @@ -1094,10 +1082,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; @@ -1120,36 +1111,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; } } @@ -1158,7 +1154,7 @@ struct LayoutEngine::Impl // Calculate the horizontal line offset. switch( alignment ) { - case HORIZONTAL_ALIGN_BEGIN: + case HorizontalAlignment::BEGIN: { line.alignmentOffset = 0.f; @@ -1169,7 +1165,7 @@ struct LayoutEngine::Impl } break; } - case HORIZONTAL_ALIGN_CENTER: + case HorizontalAlignment::CENTER: { line.alignmentOffset = 0.5f * ( boxWidth - lineLength ); @@ -1181,7 +1177,7 @@ struct LayoutEngine::Impl line.alignmentOffset = floorf( line.alignmentOffset ); // try to avoid pixel alignment. break; } - case HORIZONTAL_ALIGN_END: + case HorizontalAlignment::END: { if( isRTL ) { @@ -1209,97 +1205,67 @@ struct LayoutEngine::Impl line.ellipsis = false; } - LayoutEngine::Layout mLayout; - LayoutEngine::HorizontalAlignment mHorizontalAlignment; - LayoutEngine::VerticalAlignment mVerticalAlignment; + Type mLayout; float mCursorWidth; + float mDefaultLineSpacing; 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 ) -{ - 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, @@ -1307,17 +1273,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 Engine::SetDefaultLineSpacing( float lineSpacing ) +{ + mImpl->mDefaultLineSpacing = lineSpacing; +} + +float Engine::GetDefaultLineSpacing() const +{ + return mImpl->mDefaultLineSpacing; +} + +} // namespace Layout + } // namespace Text } // namespace Toolkit