X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-view%2Fsplit-by-new-line-char-policies.cpp;h=98ee6b863b6a81ddcc7477d2ae5a91c83ee74cae;hp=770ed654ec01b1affaa85a44fb510ad7cf0f61e7;hb=1bb77b62e55761f55511fedac0f831deff677782;hpb=84a2ec0cd7f851b6d8e5c1faf267907dbf05b1bb;ds=sidebyside diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp index 770ed65..98ee6b8 100644 --- a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp +++ b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp @@ -50,7 +50,7 @@ Vector3 SplitPosition( const TextViewRelayout::RelayoutParameters& relayoutParam ( wordOffset + relayoutParameters.mCharacterSize.width > relayoutData.mTextViewSize.width ) ) { if( !relayoutParameters.mIsNewLine && - ( relayoutParameters.mIsWhiteSpace || relayoutParameters.mIsNewLineCharacter ) ) + ( relayoutParameters.mIsWhiteSpace || relayoutParameters.mIsNewParagraphCharacter ) ) { // Current character is a white space. Don't want to move a white space to the next line. // These white spaces are placed just in the edge. @@ -58,18 +58,18 @@ Vector3 SplitPosition( const TextViewRelayout::RelayoutParameters& relayoutParam } else { - const TextViewProcessor::LineLayoutInfo& lineLayoutInfo( *( relayoutData.mTextLayoutInfo.mLinesLayoutInfo.begin() + relayoutParameters.mIndices.mLineIndex ) ); + const TextViewProcessor::ParagraphLayoutInfo& paragraphLayoutInfo( *( relayoutData.mTextLayoutInfo.mParagraphsLayoutInfo.begin() + relayoutParameters.mIndices.mParagraphIndex ) ); - TextViewRelayout::SubLineLayoutInfo subLineInfo; + TextViewRelayout::LineLayoutInfo subLineInfo; subLineInfo.mLineLength = 0.f; subLineInfo.mMaxCharHeight = 0.f; subLineInfo.mMaxAscender = 0.f; - TextViewRelayout::CalculateSubLineLayout( relayoutData.mTextViewSize.width, - relayoutParameters.mIndices, - lineLayoutInfo, - TextViewRelayout::WrapByLineAndSplit, - 1.f, // Shrink factor - subLineInfo ); + TextViewRelayout::CalculateLineLayout( relayoutData.mTextViewSize.width, + relayoutParameters.mIndices, + paragraphLayoutInfo, + TextViewRelayout::WrapByParagraphCharacterAndSplit, + 1.f, // Shrink factor + subLineInfo ); // Stores some info to calculate the line justification in a post-process. TextView::LineJustificationInfo justificationInfo; @@ -81,8 +81,8 @@ Vector3 SplitPosition( const TextViewRelayout::RelayoutParameters& relayoutParam Toolkit::TextView::LineLayoutInfo lineInfo; lineInfo.mCharacterGlobalIndex = relayoutParameters.mCharacterGlobalIndex; // Index to the first character of the next line. - lineInfo.mSize = Size( subLineInfo.mLineLength, subLineInfo.mMaxCharHeight ); // Size of this piece of line. - lineInfo.mAscender = subLineInfo.mMaxAscender; // Ascender of this piece of line. + lineInfo.mSize = Size( subLineInfo.mLineLength, subLineInfo.mMaxCharHeight ); // Size of this piece of paragraph. + lineInfo.mAscender = subLineInfo.mMaxAscender; // Ascender of this piece of paragraph. relayoutData.mLines.push_back( lineInfo ); return Vector3( 0.f, previousPositionY + subLineInfo.mMaxCharHeight + layoutParameters.mLineHeightOffset, 0.f ); @@ -129,30 +129,30 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter } relayoutParameters.mIsFirstCharacter = true; - relayoutParameters.mIndices.mLineIndex = 0u; + relayoutParameters.mIndices.mParagraphIndex = 0u; relayoutParameters.mPositionOffset = Vector3::ZERO; relayoutParameters.mCharacterGlobalIndex = 0u; - for( TextViewProcessor::LineLayoutInfoContainer::iterator lineLayoutIt = relayoutData.mTextLayoutInfo.mLinesLayoutInfo.begin(), - endLineLayoutIt = relayoutData.mTextLayoutInfo.mLinesLayoutInfo.end(); - lineLayoutIt != endLineLayoutIt; - ++lineLayoutIt, ++relayoutParameters.mIndices.mLineIndex ) + for( TextViewProcessor::ParagraphLayoutInfoContainer::iterator paragraphLayoutIt = relayoutData.mTextLayoutInfo.mParagraphsLayoutInfo.begin(), + endParagraphLayoutIt = relayoutData.mTextLayoutInfo.mParagraphsLayoutInfo.end(); + paragraphLayoutIt != endParagraphLayoutIt; + ++paragraphLayoutIt, ++relayoutParameters.mIndices.mParagraphIndex ) { - TextViewProcessor::LineLayoutInfo& lineLayoutInfo( *lineLayoutIt ); + TextViewProcessor::ParagraphLayoutInfo& paragraphLayoutInfo( *paragraphLayoutIt ); - relayoutParameters.mLineSize = lineLayoutInfo.mSize * relayoutData.mShrinkFactor; + relayoutParameters.mParagraphSize = paragraphLayoutInfo.mSize * relayoutData.mShrinkFactor; relayoutParameters.mIsNewLine = true; relayoutParameters.mIndices.mWordIndex = 0u; - for( TextViewProcessor::WordLayoutInfoContainer::iterator wordLayoutIt = lineLayoutInfo.mWordsLayoutInfo.begin(), - endWordLayoutIt = lineLayoutInfo.mWordsLayoutInfo.end(); + for( TextViewProcessor::WordLayoutInfoContainer::iterator wordLayoutIt = paragraphLayoutInfo.mWordsLayoutInfo.begin(), + endWordLayoutIt = paragraphLayoutInfo.mWordsLayoutInfo.end(); wordLayoutIt != endWordLayoutIt; ++wordLayoutIt, ++relayoutParameters.mIndices.mWordIndex ) { TextViewProcessor::WordLayoutInfo& wordLayoutInfo( *wordLayoutIt ); relayoutParameters.mIsWhiteSpace = TextViewProcessor::WordSeparator == wordLayoutInfo.mType; - relayoutParameters.mIsNewLineCharacter = TextViewProcessor::LineSeparator == wordLayoutInfo.mType; + relayoutParameters.mIsNewParagraphCharacter = TextViewProcessor::ParagraphSeparator == wordLayoutInfo.mType; relayoutParameters.mIsFirstCharacterOfWord = true; relayoutParameters.mWordSize = wordLayoutInfo.mSize; @@ -168,7 +168,7 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter TextView::LineJustificationInfo justificationInfo; justificationInfo.mIndices = relayoutParameters.mIndices; - justificationInfo.mLineLength = relayoutParameters.mLineSize.width; + justificationInfo.mLineLength = relayoutParameters.mParagraphSize.width; relayoutData.mLineJustificationInfo.push_back( justificationInfo ); } @@ -205,7 +205,7 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter if( relayoutParameters.mIsNewLine ) { relayoutParameters.mPositionOffset.x = 0.f; - relayoutParameters.mPositionOffset.y += lineLayoutInfo.mSize.height * relayoutData.mShrinkFactor; + relayoutParameters.mPositionOffset.y += paragraphLayoutInfo.mSize.height * relayoutData.mShrinkFactor; } characterLayoutInfo.mPosition = relayoutParameters.mPositionOffset; @@ -216,9 +216,9 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter relayoutParameters.mIsFirstCharacter ) { Toolkit::TextView::LineLayoutInfo lineInfo; - lineInfo.mCharacterGlobalIndex = relayoutParameters.mCharacterGlobalIndex; // Index to the first character of the next line. - lineInfo.mSize = relayoutParameters.mLineSize; // Size of this piece of line. - lineInfo.mAscender = lineLayoutInfo.mAscender * relayoutData.mShrinkFactor; // Ascender of this piece of line. + lineInfo.mCharacterGlobalIndex = relayoutParameters.mCharacterGlobalIndex; // Index to the first character of the next line. + lineInfo.mSize = relayoutParameters.mParagraphSize; // Size of this piece of paragraph. + lineInfo.mAscender = paragraphLayoutInfo.mAscender * relayoutData.mShrinkFactor; // Ascender of this piece of paragraph. relayoutData.mLines.push_back( lineInfo ); } break; @@ -256,7 +256,7 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter relayoutParameters.mIsNewLine = false; } // end characters } // end words - } // end lines + } // end paragraphs if( relayoutData.mCharacterLayoutInfoTable.empty() ) { @@ -268,14 +268,14 @@ void CalculateSizeAndPosition( const TextView::LayoutParameters& layoutParameter relayoutData.mTextSizeForRelayoutOption.height = minMaxXY.w - minMaxXY.y; } - // Check if the last character is a new line character. In that case the height should be added. - if( !relayoutData.mTextLayoutInfo.mLinesLayoutInfo.empty() ) + // Check if the last character is a new paragraph character. In that case the height should be added. + if( !relayoutData.mTextLayoutInfo.mParagraphsLayoutInfo.empty() ) { - const TextViewProcessor::LineLayoutInfo& lineLayoutInfo( *( relayoutData.mTextLayoutInfo.mLinesLayoutInfo.end() - 1u ) ); + const TextViewProcessor::ParagraphLayoutInfo& paragraphLayoutInfo( *( relayoutData.mTextLayoutInfo.mParagraphsLayoutInfo.end() - 1u ) ); - if( lineLayoutInfo.mWordsLayoutInfo.empty() ) // if it's empty, it means the last character is a new line character. + if( paragraphLayoutInfo.mWordsLayoutInfo.empty() ) // if it's empty, it means the last character is a new paragraph character. { - relayoutData.mTextSizeForRelayoutOption.height += lineLayoutInfo.mSize.height * relayoutData.mShrinkFactor; + relayoutData.mTextSizeForRelayoutOption.height += paragraphLayoutInfo.mSize.height * relayoutData.mShrinkFactor; } } }