/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
#include <dali-toolkit/internal/text/bidirectional-support.h>
#include <dali-toolkit/internal/text/cursor-helper-functions.h>
#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine-helper-functions.h>
#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
+#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
namespace Dali
{
{
namespace Text
{
+float GetLineHeight(const LineRun lineRun, bool isLastLine)
+{
+ // The line height is the addition of the line ascender, the line descender and the line spacing.
+ // However, the line descender has a negative value, hence the subtraction.
+ // In case this is the only/last line then line spacing should be ignored.
+ float lineHeight = lineRun.ascender - lineRun.descender;
+
+ if(!isLastLine || lineRun.lineSpacing > 0)
+ {
+ lineHeight += lineRun.lineSpacing;
+ }
+ return lineHeight;
+}
+
namespace Layout
{
namespace
Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_LAYOUT");
#endif
-const float MAX_FLOAT = std::numeric_limits<float>::max();
-const CharacterDirection LTR = false;
-const CharacterDirection RTL = !LTR;
-const float LINE_SPACING = 0.f;
-const float MIN_LINE_SIZE = 0.f;
-const Character HYPHEN_UNICODE = 0x002D;
+const float MAX_FLOAT = std::numeric_limits<float>::max();
+const CharacterDirection LTR = false;
+const CharacterDirection RTL = !LTR;
+const float LINE_SPACING = 0.f;
+const float MIN_LINE_SIZE = 0.f;
+const Character HYPHEN_UNICODE = 0x002D;
+const float RELATIVE_LINE_SIZE = 1.f;
inline bool isEmptyLineAtLast(const Vector<LineRun>& lines, const Vector<LineRun>::Iterator& line)
{
previousAdvance{0.f},
length{0.f},
whiteSpaceLengthEndOfLine{0.f},
- direction{LTR}
+ direction{LTR},
+ isSplitToTwoHalves(false),
+ glyphIndexInSecondHalfLine{0u},
+ characterIndexInSecondHalfLine{0u},
+ numberOfGlyphsInSecondHalfLine{0u},
+ numberOfCharactersInSecondHalfLine{0u},
+ relativeLineSize{1.0f}
+
{
}
void Clear()
{
- glyphIndex = 0u;
- characterIndex = 0u;
- numberOfGlyphs = 0u;
- numberOfCharacters = 0u;
- ascender = -MAX_FLOAT;
- descender = MAX_FLOAT;
- direction = LTR;
+ glyphIndex = 0u;
+ characterIndex = 0u;
+ numberOfGlyphs = 0u;
+ numberOfCharacters = 0u;
+ ascender = -MAX_FLOAT;
+ descender = MAX_FLOAT;
+ direction = LTR;
+ isSplitToTwoHalves = false;
+ glyphIndexInSecondHalfLine = 0u;
+ characterIndexInSecondHalfLine = 0u;
+ numberOfGlyphsInSecondHalfLine = 0u;
+ numberOfCharactersInSecondHalfLine = 0u;
+ relativeLineSize = 1.0f;
}
GlyphIndex glyphIndex; ///< Index of the first glyph to be laid-out.
float length; ///< The current length of the line.
float whiteSpaceLengthEndOfLine; ///< The length of the white spaces at the end of the line.
CharacterDirection direction;
+
+ bool isSplitToTwoHalves; ///< Whether the second half is defined.
+ GlyphIndex glyphIndexInSecondHalfLine; ///< Index of the first glyph to be laid-out for the second half of line.
+ CharacterIndex characterIndexInSecondHalfLine; ///< Index of the first character to be laid-out for the second half of line.
+ Length numberOfGlyphsInSecondHalfLine; ///< The number of glyph which fit in one line for the second half of line.
+ Length numberOfCharactersInSecondHalfLine; ///< The number of characters which fit in one line for the second half of line.
+
+ float relativeLineSize; ///< The relative line size to be applied for this line.
};
struct LayoutBidiParameters
: mLayout{Layout::Engine::SINGLE_LINE_BOX},
mCursorWidth{0.f},
mDefaultLineSpacing{LINE_SPACING},
- mDefaultLineSize{MIN_LINE_SIZE}
+ mDefaultLineSize{MIN_LINE_SIZE},
+ mRelativeLineSize{RELATIVE_LINE_SIZE}
+ {
+ }
+
+ /**
+ * @brief get the line spacing.
+ *
+ * @param[in] textSize The text size.
+ * @param[in] relativeLineSize The relative line size to be applied.
+ * @return the line spacing value.
+ */
+ float GetLineSpacing(float textSize, float relativeLineSize)
{
+ float lineSpacing;
+ float relTextSize;
+
+ // Sets the line size
+ lineSpacing = mDefaultLineSize - textSize;
+ lineSpacing = lineSpacing < 0.f ? 0.f : lineSpacing;
+
+ // Add the line spacing
+ lineSpacing += mDefaultLineSpacing;
+
+ //subtract line spcaing if relativeLineSize < 1 & larger than min height
+ relTextSize = textSize * relativeLineSize;
+ if(relTextSize > mDefaultLineSize)
+ {
+ if(relativeLineSize < 1)
+ {
+ //subtract the difference (always will be positive)
+ lineSpacing -= (textSize - relTextSize);
+ }
+ else
+ {
+ //reverse the addition in the top.
+ if(mDefaultLineSize > textSize)
+ {
+ lineSpacing -= mDefaultLineSize - textSize;
+ }
+
+ //add difference instead
+ lineSpacing += relTextSize - textSize;
+ }
+ }
+
+ return lineSpacing;
}
/**
// Sets the minimum descender.
lineLayout.descender = std::min(lineLayout.descender, fontMetrics.descender);
- // Sets the line size
- lineLayout.lineSpacing = mDefaultLineSize - (lineLayout.ascender + -lineLayout.descender);
- lineLayout.lineSpacing = lineLayout.lineSpacing < 0.f ? 0.f : lineLayout.lineSpacing;
-
- // Add the line spacing
- lineLayout.lineSpacing += mDefaultLineSpacing;
+ lineLayout.lineSpacing = GetLineSpacing(lineLayout.ascender + -lineLayout.descender, lineLayout.relativeLineSize);
}
/**
*
* @param[in,out] lineLayout The line layout.
* @param[in] tmpLineLayout A temporary line layout.
+ * @param[in] isShifted Whether to shift first glyph and character indices.
*/
void MergeLineLayout(LineLayout& lineLayout,
- const LineLayout& tmpLineLayout)
+ const LineLayout& tmpLineLayout,
+ bool isShifted)
{
lineLayout.numberOfCharacters += tmpLineLayout.numberOfCharacters;
lineLayout.numberOfGlyphs += tmpLineLayout.numberOfGlyphs;
// Sets the minimum descender.
lineLayout.descender = std::min(lineLayout.descender, tmpLineLayout.descender);
+
+ // To handle cases START in ellipsis position when want to shift first glyph to let width fit.
+ if(isShifted)
+ {
+ lineLayout.glyphIndex = tmpLineLayout.glyphIndex;
+ lineLayout.characterIndex = tmpLineLayout.characterIndex;
+ }
+
+ lineLayout.isSplitToTwoHalves = tmpLineLayout.isSplitToTwoHalves;
+ lineLayout.glyphIndexInSecondHalfLine = tmpLineLayout.glyphIndexInSecondHalfLine;
+ lineLayout.characterIndexInSecondHalfLine = tmpLineLayout.characterIndexInSecondHalfLine;
+ lineLayout.numberOfGlyphsInSecondHalfLine = tmpLineLayout.numberOfGlyphsInSecondHalfLine;
+ lineLayout.numberOfCharactersInSecondHalfLine = tmpLineLayout.numberOfCharactersInSecondHalfLine;
}
void LayoutRightToLeft(const Parameters& parameters,
float& length,
float& whiteSpaceLengthEndOfLine)
{
+ // Travers characters in line then draw it form right to left by mapping index using visualToLogicalMap.
+ // When the line is spllited by MIDDLE ellipsis then travers the second half of line "characterRunForSecondHalfLine"
+ // then the first half of line "characterRun",
+ // Otherwise travers whole characters in"characterRun".
+
const Character* const textBuffer = parameters.textModel->mLogicalModel->mText.Begin();
const Length* const charactersPerGlyphBuffer = parameters.textModel->mVisualModel->mCharactersPerGlyph.Begin();
const GlyphInfo* const glyphsBuffer = parameters.textModel->mVisualModel->mGlyphs.Begin();
const float outlineWidth = static_cast<float>(parameters.textModel->GetOutlineWidth());
const GlyphIndex lastGlyphOfParagraphPlusOne = parameters.startGlyphIndex + parameters.numberOfGlyphs;
+ const float modelCharacterSpacing = parameters.textModel->mVisualModel->GetCharacterSpacing();
+
+ // Get the character-spacing runs.
+ const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = parameters.textModel->mVisualModel->GetCharacterSpacingGlyphRuns();
CharacterIndex characterLogicalIndex = 0u;
- CharacterIndex characterVisualIndex = bidirectionalLineInfo.characterRun.characterIndex + *(bidirectionalLineInfo.visualToLogicalMap + characterLogicalIndex);
+ CharacterIndex characterVisualIndex = 0u;
+
+ float calculatedAdvance = 0.f;
+
+ // If there are characters in the second half of Line then the first visual index mapped from visualToLogicalMapSecondHalf
+ // Otherwise maps the first visual index from visualToLogicalMap.
+ // This is to initialize the first visual index.
+ if(bidirectionalLineInfo.characterRunForSecondHalfLine.numberOfCharacters > 0u)
+ {
+ characterVisualIndex = bidirectionalLineInfo.characterRunForSecondHalfLine.characterIndex + *(bidirectionalLineInfo.visualToLogicalMapSecondHalf + characterLogicalIndex);
+ }
+ else
+ {
+ characterVisualIndex = bidirectionalLineInfo.characterRun.characterIndex + *(bidirectionalLineInfo.visualToLogicalMap + characterLogicalIndex);
+ }
+
+ bool extendedToSecondHalf = false; // Whether the logical index is extended to second half
if(RTL == bidirectionalLineInfo.direction)
{
- while(TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex)))
+ // If there are characters in the second half of Line.
+ if(bidirectionalLineInfo.characterRunForSecondHalfLine.numberOfCharacters > 0u)
{
- const GlyphInfo& glyphInfo = *(glyphsBuffer + *(charactersToGlyphsBuffer + characterVisualIndex));
+ // Keep adding the WhiteSpaces to the whiteSpaceLengthEndOfLine
+ while(TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex)))
+ {
+ const GlyphInfo& glyphInfo = *(glyphsBuffer + *(charactersToGlyphsBuffer + characterVisualIndex));
- whiteSpaceLengthEndOfLine += glyphInfo.advance;
+ const float characterSpacing = GetGlyphCharacterSpacing(characterVisualIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, glyphInfo.advance);
+ whiteSpaceLengthEndOfLine += calculatedAdvance;
- ++characterLogicalIndex;
- characterVisualIndex = bidirectionalLineInfo.characterRun.characterIndex + *(bidirectionalLineInfo.visualToLogicalMap + characterLogicalIndex);
+ ++characterLogicalIndex;
+ characterVisualIndex = bidirectionalLineInfo.characterRunForSecondHalfLine.characterIndex + *(bidirectionalLineInfo.visualToLogicalMapSecondHalf + characterLogicalIndex);
+ }
+ }
+
+ // If all characters in the second half of Line are WhiteSpaces.
+ // then continue adding the WhiteSpaces from the first hel of Line.
+ // Also this is valid when the line was not splitted.
+ if(characterLogicalIndex == bidirectionalLineInfo.characterRunForSecondHalfLine.numberOfCharacters)
+ {
+ extendedToSecondHalf = true; // Whether the logical index is extended to second half
+ characterLogicalIndex = 0u;
+ characterVisualIndex = bidirectionalLineInfo.characterRun.characterIndex + *(bidirectionalLineInfo.visualToLogicalMap + characterLogicalIndex);
+
+ // Keep adding the WhiteSpaces to the whiteSpaceLengthEndOfLine
+ while(TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex)))
+ {
+ const GlyphInfo& glyphInfo = *(glyphsBuffer + *(charactersToGlyphsBuffer + characterVisualIndex));
+
+ const float characterSpacing = GetGlyphCharacterSpacing(characterVisualIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, glyphInfo.advance);
+ whiteSpaceLengthEndOfLine += calculatedAdvance;
+
+ ++characterLogicalIndex;
+ characterVisualIndex = bidirectionalLineInfo.characterRun.characterIndex + *(bidirectionalLineInfo.visualToLogicalMap + characterLogicalIndex);
+ }
}
}
+ // Here's the first index of character is not WhiteSpace
const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
// Check whether the first glyph comes from a character that is shaped in multiple glyphs.
charactersPerGlyphBuffer);
GlyphMetrics glyphMetrics;
+ const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
GetGlyphsMetrics(glyphIndex,
numberOfGLyphsInGroup,
glyphMetrics,
glyphsBuffer,
- mMetrics);
+ mMetrics,
+ calculatedAdvance);
float penX = -glyphMetrics.xBearing + mCursorWidth + outlineWidth;
// Traverses the characters of the right to left paragraph.
+ // Continue in the second half of line, because in it the first index of character that is not WhiteSpace.
+ if(!extendedToSecondHalf &&
+ bidirectionalLineInfo.characterRunForSecondHalfLine.numberOfCharacters > 0u)
+ {
+ for(; characterLogicalIndex < bidirectionalLineInfo.characterRunForSecondHalfLine.numberOfCharacters;)
+ {
+ // Convert the character in the logical order into the character in the visual order.
+ const CharacterIndex characterVisualIndex = bidirectionalLineInfo.characterRunForSecondHalfLine.characterIndex + *(bidirectionalLineInfo.visualToLogicalMapSecondHalf + characterLogicalIndex);
+ const bool isWhiteSpace = TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex));
+
+ const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
+
+ // Check whether this glyph comes from a character that is shaped in multiple glyphs.
+ const Length numberOfGLyphsInGroup = GetNumberOfGlyphsOfGroup(glyphIndex,
+ lastGlyphOfParagraphPlusOne,
+ charactersPerGlyphBuffer);
+
+ characterLogicalIndex += *(charactersPerGlyphBuffer + glyphIndex + numberOfGLyphsInGroup - 1u);
+
+ GlyphMetrics glyphMetrics;
+ const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
+ GetGlyphsMetrics(glyphIndex,
+ numberOfGLyphsInGroup,
+ glyphMetrics,
+ glyphsBuffer,
+ mMetrics,
+ calculatedAdvance);
+
+ if(isWhiteSpace)
+ {
+ // If glyph is WhiteSpace then:
+ // For RTL it is whitespace but not at endOfLine. Use "advance" to accumulate length and shift penX.
+ // the endOfLine in RTL was the headOfLine for layouting.
+ // But for LTR added it to the endOfLine and use "advance" to accumulate length.
+ if(RTL == bidirectionalLineInfo.direction)
+ {
+ length += glyphMetrics.advance;
+ }
+ else
+ {
+ whiteSpaceLengthEndOfLine += glyphMetrics.advance;
+ }
+ penX += glyphMetrics.advance;
+ }
+ else
+ {
+ // If glyph is not whiteSpace then:
+ // Reset endOfLine for LTR because there is a non-whiteSpace so the tail of line is not whiteSpaces
+ // Use "advance" and "interGlyphExtraAdvance" to shift penX.
+ // Set length to the maximum possible length, of the current glyph "xBearing" and "width" are shifted penX to length greater than current lenght.
+ // Otherwise the current length is maximum.
+ if(LTR == bidirectionalLineInfo.direction)
+ {
+ whiteSpaceLengthEndOfLine = 0.f;
+ }
+ length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+ penX += (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
+ }
+ }
+ }
+
+ // Continue traversing in the first half of line or in the whole line.
+ // If the second half of line was extended then continue from logical index in the first half of line
+ // Also this is valid when the line was not splitted and there were WhiteSpace.
+ // Otherwise start from first logical index in line.
+ characterLogicalIndex = extendedToSecondHalf ? characterLogicalIndex : 0u;
for(; characterLogicalIndex < bidirectionalLineInfo.characterRun.numberOfCharacters;)
{
// Convert the character in the logical order into the character in the visual order.
characterLogicalIndex += *(charactersPerGlyphBuffer + glyphIndex + numberOfGLyphsInGroup - 1u);
GlyphMetrics glyphMetrics;
+ const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + characterVisualIndex), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
GetGlyphsMetrics(glyphIndex,
numberOfGLyphsInGroup,
glyphMetrics,
glyphsBuffer,
- mMetrics);
+ mMetrics,
+ calculatedAdvance);
if(isWhiteSpace)
{
+ // If glyph is WhiteSpace then:
+ // For RTL it is whitespace but not at endOfLine. Use "advance" to accumulate length and shift penX.
+ // the endOfLine in RTL was the headOfLine for layouting.
+ // But for LTR added it to the endOfLine and use "advance" to accumulate length.
if(RTL == bidirectionalLineInfo.direction)
{
length += glyphMetrics.advance;
}
else
{
+ // If glyph is not whiteSpace then:
+ // Reset endOfLine for LTR because there is a non-whiteSpace so the tail of line is not whiteSpaces
+ // Use "advance" and "interGlyphExtraAdvance" to shift penX.
+ // Set length to the maximum possible length, of the current glyph "xBearing" and "width" are shifted penX to length greater than current lenght.
+ // Otherwise the current length is maximum.
if(LTR == bidirectionalLineInfo.direction)
{
whiteSpaceLengthEndOfLine = 0.f;
LayoutBidiParameters& bidiParameters,
const LineLayout& currentLineLayout,
LineLayout& lineLayout,
- bool breakInCharacters)
+ bool breakInCharacters,
+ bool enforceEllipsisInSingleLine)
{
const Length* const charactersPerGlyphBuffer = parameters.textModel->mVisualModel->mCharactersPerGlyph.Begin();
bidiParameters.bidiLineIndex,
lineLayout.characterIndex,
lineLayout.numberOfCharacters,
+ lineLayout.characterIndexInSecondHalfLine,
+ lineLayout.numberOfCharactersInSecondHalfLine,
bidiParameters.paragraphDirection);
// Recalculate the length of the line and update the layout.
lineLayout.whiteSpaceLengthEndOfLine = whiteSpaceLengthEndOfLine;
if(!Equals(length, lineLayout.length))
{
- const bool isMultiline = mLayout == MULTI_LINE_BOX;
+ const bool isMultiline = (!enforceEllipsisInSingleLine) && (mLayout == MULTI_LINE_BOX);
if(isMultiline && (length > parameters.boundingBox.width))
{
bidiParameters.bidiLineIndex,
lineLayout.characterIndex,
lineLayout.numberOfCharacters,
+ lineLayout.characterIndexInSecondHalfLine,
+ lineLayout.numberOfCharactersInSecondHalfLine,
bidiParameters.paragraphDirection);
const BidirectionalLineInfoRun& bidirectionalLineInfo = *(bidirectionalLinesInfo.Begin() + bidiParameters.bidiLineIndex);
* @param[] bidiParameters Bidirectional info for the current line.
* @param[out] lineLayout The line layout.
* @param[in] completelyFill Whether to completely fill the line ( even if the last word exceeds the boundaries ).
+ * @param[in] ellipsisPosition Where is the location the text elide
*/
- void GetLineLayoutForBox(const Parameters& parameters,
- LayoutBidiParameters& bidiParameters,
- LineLayout& lineLayout,
- bool completelyFill)
+ void GetLineLayoutForBox(const Parameters& parameters,
+ LayoutBidiParameters& bidiParameters,
+ LineLayout& lineLayout,
+ bool completelyFill,
+ DevelText::EllipsisPosition::Type ellipsisPosition,
+ bool enforceEllipsisInSingleLine,
+ bool elideTextEnabled)
{
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->GetLineLayoutForBox\n");
DALI_LOG_INFO(gLogFilter, Debug::Verbose, " initial glyph index : %d\n", lineLayout.glyphIndex);
const float outlineWidth = static_cast<float>(parameters.textModel->GetOutlineWidth());
const Length totalNumberOfGlyphs = parameters.textModel->mVisualModel->mGlyphs.Count();
- const bool isMultiline = mLayout == MULTI_LINE_BOX;
+ const bool isMultiline = !enforceEllipsisInSingleLine && (mLayout == MULTI_LINE_BOX);
const bool isWordLaidOut = parameters.textModel->mLineWrapMode == Text::LineWrap::WORD ||
(parameters.textModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION) ||
(parameters.textModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::MIXED);
const bool isHyphenMode = parameters.textModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::HYPHENATION;
const bool isMixedMode = parameters.textModel->mLineWrapMode == (Text::LineWrap::Mode)DevelText::LineWrap::MIXED;
+ const bool isSplitToTwoHalves = elideTextEnabled && !isMultiline && ellipsisPosition == DevelText::EllipsisPosition::MIDDLE;
+
// The last glyph to be laid-out.
const GlyphIndex lastGlyphOfParagraphPlusOne = parameters.startGlyphIndex + parameters.numberOfGlyphs;
lastGlyphOfParagraphPlusOne,
charactersPerGlyphBuffer);
+ float targetWidth = parameters.boundingBox.width;
+ float widthFirstHalf = ((ellipsisPosition != DevelText::EllipsisPosition::MIDDLE) ? targetWidth : targetWidth - std::floor(targetWidth / 2));
+
+ bool isSecondHalf = false;
+ // Character Spacing
+ const float modelCharacterSpacing = parameters.textModel->mVisualModel->GetCharacterSpacing();
+ float calculatedAdvance = 0.f;
+ Vector<CharacterIndex>& glyphToCharacterMap = parameters.textModel->mVisualModel->mGlyphsToCharacters;
+ const CharacterIndex* glyphToCharacterMapBuffer = glyphToCharacterMap.Begin();
+
+ // Get the character-spacing runs.
+ const Vector<CharacterSpacingGlyphRun>& characterSpacingGlyphRuns = parameters.textModel->mVisualModel->GetCharacterSpacingGlyphRuns();
+
GlyphMetrics glyphMetrics;
+ const float characterSpacing = GetGlyphCharacterSpacing(lineLayout.glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + lineLayout.glyphIndex))), characterSpacing, (*(glyphsBuffer + lineLayout.glyphIndex)).advance);
GetGlyphsMetrics(lineLayout.glyphIndex,
numberOfGLyphsInGroup,
glyphMetrics,
glyphsBuffer,
- mMetrics);
+ mMetrics,
+ calculatedAdvance);
// Set the direction of the first character of the line.
lineLayout.characterIndex = *(glyphsToCharactersBuffer + lineLayout.glyphIndex);
// It needs to add as well space for the cursor if the text is in edit mode and extra space in case the text is outlined.
tmpLineLayout.penX = -glyphMetrics.xBearing + mCursorWidth + outlineWidth;
+ tmpLineLayout.relativeLineSize = lineLayout.relativeLineSize;
+
// Calculate the line height if there is no characters.
FontId lastFontId = glyphMetrics.fontId;
UpdateLineHeight(glyphMetrics, tmpLineLayout);
charactersPerGlyphBuffer);
GlyphMetrics glyphMetrics;
+ const float characterSpacing = GetGlyphCharacterSpacing(glyphIndex, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + glyphIndex))), characterSpacing, (*(glyphsBuffer + glyphIndex)).advance);
GetGlyphsMetrics(glyphIndex,
numberOfGLyphsInGroup,
glyphMetrics,
glyphsBuffer,
- mMetrics);
+ mMetrics,
+ calculatedAdvance);
const bool isLastGlyph = glyphIndex + numberOfGLyphsInGroup == totalNumberOfGlyphs;
// Get the line break info for the current character.
const LineBreakInfo lineBreakInfo = hasCharacters ? *(lineBreakInfoBuffer + characterLastIndex) : TextAbstraction::LINE_NO_BREAK;
- // Increase the number of characters.
- tmpLineLayout.numberOfCharacters += charactersPerGlyph;
+ if(isSecondHalf)
+ {
+ // Increase the number of characters.
+ tmpLineLayout.numberOfCharactersInSecondHalfLine += charactersPerGlyph;
+
+ // Increase the number of glyphs.
+ tmpLineLayout.numberOfGlyphsInSecondHalfLine += numberOfGLyphsInGroup;
+ }
+ else
+ {
+ // Increase the number of characters.
+ tmpLineLayout.numberOfCharacters += charactersPerGlyph;
- // Increase the number of glyphs.
- tmpLineLayout.numberOfGlyphs += numberOfGLyphsInGroup;
+ // Increase the number of glyphs.
+ tmpLineLayout.numberOfGlyphs += numberOfGLyphsInGroup;
+ }
// Check whether is a white space.
const Character character = *(textBuffer + characterFirstIndex);
if(isWhiteSpace)
{
// Add the length to the length of white spaces at the end of the line.
- tmpLineLayout.whiteSpaceLengthEndOfLine += glyphMetrics.advance; // The advance is used as the width is always zero for the white spaces.
+ tmpLineLayout.whiteSpaceLengthEndOfLine += glyphMetrics.advance;
+ // The advance is used as the width is always zero for the white spaces.
}
else
{
tmpLineLayout.whiteSpaceLengthEndOfLine = 0.f;
}
+ if(isSplitToTwoHalves && (!isSecondHalf) &&
+ (tmpLineLayout.length + tmpLineLayout.whiteSpaceLengthEndOfLine > widthFirstHalf))
+ {
+ tmpLineLayout.numberOfCharacters -= charactersPerGlyph;
+ tmpLineLayout.numberOfGlyphs -= numberOfGLyphsInGroup;
+
+ tmpLineLayout.numberOfCharactersInSecondHalfLine += charactersPerGlyph;
+ tmpLineLayout.numberOfGlyphsInSecondHalfLine += numberOfGLyphsInGroup;
+
+ tmpLineLayout.glyphIndexInSecondHalfLine = tmpLineLayout.glyphIndex + tmpLineLayout.numberOfGlyphs;
+ tmpLineLayout.characterIndexInSecondHalfLine = tmpLineLayout.characterIndex + tmpLineLayout.numberOfCharacters;
+
+ tmpLineLayout.isSplitToTwoHalves = isSecondHalf = true;
+ }
// Check if the accumulated length fits in the width of the box.
- if((completelyFill || isMultiline) && !isWhiteSpace &&
- (tmpLineLayout.length > parameters.boundingBox.width))
+ if((ellipsisPosition == DevelText::EllipsisPosition::START ||
+ (ellipsisPosition == DevelText::EllipsisPosition::MIDDLE && isSecondHalf)) &&
+ completelyFill && !isMultiline &&
+ (tmpLineLayout.length + tmpLineLayout.whiteSpaceLengthEndOfLine > targetWidth))
+ {
+ GlyphIndex glyphIndexToRemove = isSecondHalf ? tmpLineLayout.glyphIndexInSecondHalfLine : tmpLineLayout.glyphIndex;
+
+ while(tmpLineLayout.length + tmpLineLayout.whiteSpaceLengthEndOfLine > targetWidth && glyphIndexToRemove < glyphIndex)
+ {
+ GlyphMetrics glyphMetrics;
+ const float characterSpacing = GetGlyphCharacterSpacing(glyphIndexToRemove, characterSpacingGlyphRuns, modelCharacterSpacing);
+ calculatedAdvance = GetCalculatedAdvance(*(textBuffer + (*(glyphToCharacterMapBuffer + glyphIndexToRemove))), characterSpacing, (*(glyphsBuffer + glyphIndexToRemove)).advance);
+ GetGlyphsMetrics(glyphIndexToRemove,
+ numberOfGLyphsInGroup,
+ glyphMetrics,
+ glyphsBuffer,
+ mMetrics,
+ calculatedAdvance);
+
+ const Length numberOfGLyphsInGroup = GetNumberOfGlyphsOfGroup(glyphIndexToRemove,
+ lastGlyphOfParagraphPlusOne,
+ charactersPerGlyphBuffer);
+
+ const Length charactersPerGlyph = *(charactersPerGlyphBuffer + glyphIndexToRemove + numberOfGLyphsInGroup - 1u);
+ const bool hasCharacters = charactersPerGlyph > 0u;
+ const CharacterIndex characterFirstIndex = *(glyphsToCharactersBuffer + glyphIndexToRemove);
+ const CharacterIndex characterLastIndex = characterFirstIndex + (hasCharacters ? charactersPerGlyph - 1u : 0u);
+
+ // Check whether is a white space.
+ const Character character = *(textBuffer + characterFirstIndex);
+ const bool isRemovedGlyphWhiteSpace = TextAbstraction::IsWhiteSpace(character);
+
+ if(isSecondHalf)
+ {
+ // Decrease the number of characters for SecondHalf.
+ tmpLineLayout.numberOfCharactersInSecondHalfLine -= charactersPerGlyph;
+
+ // Decrease the number of glyphs for SecondHalf.
+ tmpLineLayout.numberOfGlyphsInSecondHalfLine -= numberOfGLyphsInGroup;
+ }
+ else
+ {
+ // Decrease the number of characters.
+ tmpLineLayout.numberOfCharacters -= charactersPerGlyph;
+
+ // Decrease the number of glyphs.
+ tmpLineLayout.numberOfGlyphs -= numberOfGLyphsInGroup;
+ }
+
+ if(isRemovedGlyphWhiteSpace)
+ {
+ tmpLineLayout.penX -= glyphMetrics.advance;
+ tmpLineLayout.length -= glyphMetrics.advance;
+ }
+ else
+ {
+ tmpLineLayout.penX -= (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
+ tmpLineLayout.length -= (std::min(glyphMetrics.advance + parameters.interGlyphExtraAdvance, glyphMetrics.xBearing + glyphMetrics.width));
+ }
+
+ if(isSecondHalf)
+ {
+ tmpLineLayout.glyphIndexInSecondHalfLine += numberOfGLyphsInGroup;
+ tmpLineLayout.characterIndexInSecondHalfLine = characterLastIndex + 1u;
+ glyphIndexToRemove = tmpLineLayout.glyphIndexInSecondHalfLine;
+ }
+ else
+ {
+ tmpLineLayout.glyphIndex += numberOfGLyphsInGroup;
+ tmpLineLayout.characterIndex = characterLastIndex + 1u;
+ glyphIndexToRemove = tmpLineLayout.glyphIndex;
+ }
+ }
+ }
+ else if((completelyFill || isMultiline) &&
+ (tmpLineLayout.length > targetWidth))
{
// Current word does not fit in the box's width.
if(((oneHyphenLaidOut && isHyphenMode) ||
DALI_LOG_INFO(gLogFilter, Debug::Verbose, " Break the word by character\n");
// The word doesn't fit in the control's width. It needs to be split by character.
- if(tmpLineLayout.numberOfGlyphs > 0u)
+ if(tmpLineLayout.numberOfGlyphs + tmpLineLayout.numberOfGlyphsInSecondHalfLine > 0u)
{
- tmpLineLayout.numberOfCharacters -= charactersPerGlyph;
- tmpLineLayout.numberOfGlyphs -= numberOfGLyphsInGroup;
+ if(isSecondHalf)
+ {
+ tmpLineLayout.numberOfCharactersInSecondHalfLine -= charactersPerGlyph;
+ tmpLineLayout.numberOfGlyphsInSecondHalfLine -= numberOfGLyphsInGroup;
+ }
+ else
+ {
+ tmpLineLayout.numberOfCharacters -= charactersPerGlyph;
+ tmpLineLayout.numberOfGlyphs -= numberOfGLyphsInGroup;
+ }
tmpLineLayout.penX = previousTmpPenX;
tmpLineLayout.previousAdvance = previousTmpAdvance;
tmpLineLayout.whiteSpaceLengthEndOfLine = previousTmpWhiteSpaceLengthEndOfLine;
}
- // Add part of the word to the line layout.
- MergeLineLayout(lineLayout, tmpLineLayout);
+ if(ellipsisPosition == DevelText::EllipsisPosition::START && !isMultiline)
+ {
+ // Add part of the word to the line layout and shift the first glyph.
+ MergeLineLayout(lineLayout, tmpLineLayout, true);
+ }
+ else if(ellipsisPosition != DevelText::EllipsisPosition::START ||
+ (ellipsisPosition == DevelText::EllipsisPosition::START && (!completelyFill)))
+ {
+ // Add part of the word to the line layout.
+ MergeLineLayout(lineLayout, tmpLineLayout, false);
+ }
}
else
{
bidiParameters,
lineLayout,
lineLayout,
- true);
+ true,
+ enforceEllipsisInSingleLine);
}
return;
{
LineLayout currentLineLayout = lineLayout;
oneHyphenLaidOut = false;
- // Must break the line. Update the line layout and return.
- MergeLineLayout(lineLayout, tmpLineLayout);
+
+ if(ellipsisPosition == DevelText::EllipsisPosition::START && !isMultiline)
+ {
+ // Must break the line. Update the line layout, shift the first glyph and return.
+ MergeLineLayout(lineLayout, tmpLineLayout, true);
+ }
+ else
+ {
+ // Must break the line. Update the line layout and return.
+ MergeLineLayout(lineLayout, tmpLineLayout, false);
+ }
// Reorder the RTL line.
if(bidiParameters.isBidirectional)
bidiParameters,
currentLineLayout,
lineLayout,
- false);
+ false,
+ enforceEllipsisInSingleLine);
}
DALI_LOG_INFO(gLogFilter, Debug::Verbose, " Must break\n");
// Current glyph is the last one of the current word.
// Add the temporal layout to the current one.
- MergeLineLayout(lineLayout, tmpLineLayout);
+ MergeLineLayout(lineLayout, tmpLineLayout, false);
tmpLineLayout.Clear();
}
mMetrics->GetGlyphMetrics(&hyphenGlyph, 1);
- if((tmpLineLayout.length + hyphenGlyph.width) <= parameters.boundingBox.width)
+ if((tmpLineLayout.length + hyphenGlyph.width) <= targetWidth)
{
hyphenIndex = glyphIndex;
oneHyphenLaidOut = true;
// Current glyph is the last one of the current word hyphen.
// Add the temporal layout to the current one.
- MergeLineLayout(lineLayout, tmpLineLayout);
+ MergeLineLayout(lineLayout, tmpLineLayout, false);
tmpLineLayout.Clear();
}
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--GetLineLayoutForBox\n");
}
- void SetGlyphPositions(const GlyphInfo* const glyphsBuffer,
- Length numberOfGlyphs,
- float outlineWidth,
- float interGlyphExtraAdvance,
- Vector2* glyphPositionsBuffer)
+ void SetGlyphPositions(const Parameters& layoutParameters,
+ Vector2* glyphPositionsBuffer,
+ const LineLayout& layout)
{
// Traverse the glyphs and set the positions.
+ const GlyphInfo* const glyphsBuffer = layoutParameters.textModel->mVisualModel->mGlyphs.Begin();
+ const float outlineWidth = static_cast<float>(layoutParameters.textModel->GetOutlineWidth());
+ const Length numberOfGlyphs = layout.numberOfGlyphs;
+ const float interGlyphExtraAdvance = layoutParameters.interGlyphExtraAdvance;
+
+ const GlyphIndex startIndexForGlyph = layout.glyphIndex;
+ const GlyphIndex startIndexForGlyphPositions = startIndexForGlyph - layoutParameters.startGlyphIndex;
+
// 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 = -glyph.xBearing + mCursorWidth + outlineWidth;
-
- for(GlyphIndex i = 0u; i < numberOfGlyphs; ++i)
+ const GlyphInfo& glyph = *(glyphsBuffer + startIndexForGlyph);
+ float penX = -glyph.xBearing + mCursorWidth + outlineWidth; //
+
+ CalculateGlyphPositionsLTR(layoutParameters.textModel->mVisualModel,
+ layoutParameters.textModel->mLogicalModel,
+ interGlyphExtraAdvance,
+ numberOfGlyphs,
+ startIndexForGlyph, // startIndexForGlyph is the index of the first glyph in the line
+ startIndexForGlyphPositions,
+ glyphPositionsBuffer,
+ penX);
+
+ if(layout.isSplitToTwoHalves)
{
- const GlyphInfo& glyph = *(glyphsBuffer + i);
- Vector2& position = *(glyphPositionsBuffer + i);
-
- position.x = penX + glyph.xBearing;
- position.y = -glyph.yBearing;
-
- penX += (glyph.advance + interGlyphExtraAdvance);
+ const GlyphIndex startIndexForGlyphInSecondHalf = layout.glyphIndexInSecondHalfLine;
+ const Length numberOfGlyphsInSecondHalfLine = layout.numberOfGlyphsInSecondHalfLine;
+ const GlyphIndex startIndexForGlyphPositionsnSecondHalf = layout.glyphIndexInSecondHalfLine - layoutParameters.startGlyphIndex;
+
+ CalculateGlyphPositionsLTR(layoutParameters.textModel->mVisualModel,
+ layoutParameters.textModel->mLogicalModel,
+ interGlyphExtraAdvance,
+ numberOfGlyphsInSecondHalfLine,
+ startIndexForGlyphInSecondHalf, // startIndexForGlyph is the index of the first glyph in the line
+ startIndexForGlyphPositionsnSecondHalf,
+ glyphPositionsBuffer,
+ penX);
}
}
LayoutBidiParameters& layoutBidiParameters,
const LineLayout& layout)
{
- const Character* const textBuffer = layoutParameters.textModel->mLogicalModel->mText.Begin();
const BidirectionalLineInfoRun& bidiLine = layoutParameters.textModel->mLogicalModel->mBidirectionalLineInfo[layoutBidiParameters.bidiLineIndex];
const GlyphInfo* const glyphsBuffer = layoutParameters.textModel->mVisualModel->mGlyphs.Begin();
const GlyphIndex* const charactersToGlyphsBuffer = layoutParameters.textModel->mVisualModel->mCharactersToGlyph.Begin();
- const Length* const glyphsPerCharacterBuffer = layoutParameters.textModel->mVisualModel->mGlyphsPerCharacter.Begin();
CharacterIndex characterLogicalIndex = 0u;
- CharacterIndex characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
+ CharacterIndex characterVisualIndex = bidiLine.characterRunForSecondHalfLine.characterIndex + *(bidiLine.visualToLogicalMapSecondHalf + characterLogicalIndex);
+ bool extendedToSecondHalf = false; // Whether the logical index is extended to second half
float penX = 0.f;
- while(TextAbstraction::IsWhiteSpace(*(textBuffer + characterVisualIndex)))
- {
- const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
- const GlyphInfo& glyph = *(glyphsBuffer + glyphIndex);
-
- Vector2& position = *(glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex);
- position.x = penX;
- position.y = -glyph.yBearing;
- penX += glyph.advance;
+ if(layout.isSplitToTwoHalves)
+ {
+ CalculateGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+ layoutParameters.textModel->mLogicalModel,
+ layoutBidiParameters.bidiLineIndex,
+ layoutParameters.startGlyphIndex,
+ glyphPositionsBuffer,
+ characterVisualIndex,
+ characterLogicalIndex,
+ penX);
+ }
- ++characterLogicalIndex;
- characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
+ if(characterLogicalIndex == bidiLine.characterRunForSecondHalfLine.numberOfCharacters)
+ {
+ extendedToSecondHalf = true;
+ characterLogicalIndex = 0u;
+ characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
+
+ CalculateGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+ layoutParameters.textModel->mLogicalModel,
+ layoutBidiParameters.bidiLineIndex,
+ layoutParameters.startGlyphIndex,
+ glyphPositionsBuffer,
+ characterVisualIndex,
+ characterLogicalIndex,
+ penX);
}
const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex);
penX += -glyph.xBearing;
// Traverses the characters of the right to left paragraph.
- for(; characterLogicalIndex < bidiLine.characterRun.numberOfCharacters;
- ++characterLogicalIndex)
+ if(layout.isSplitToTwoHalves && !extendedToSecondHalf)
{
- // Convert the character in the logical order into the character in the visual order.
- const CharacterIndex characterVisualIndex = bidiLine.characterRun.characterIndex + *(bidiLine.visualToLogicalMap + characterLogicalIndex);
-
- // Get the number of glyphs of the character.
- const Length numberOfGlyphs = *(glyphsPerCharacterBuffer + characterVisualIndex);
-
- for(GlyphIndex index = 0u; index < numberOfGlyphs; ++index)
- {
- // Convert the character in the visual order into the glyph in the visual order.
- const GlyphIndex glyphIndex = *(charactersToGlyphsBuffer + characterVisualIndex) + index;
-
- DALI_ASSERT_DEBUG(glyphIndex < layoutParameters.textModel->mVisualModel->mGlyphs.Count());
-
- const GlyphInfo& glyph = *(glyphsBuffer + glyphIndex);
- Vector2& position = *(glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex);
-
- position.x = penX + glyph.xBearing;
- position.y = -glyph.yBearing;
-
- penX += (glyph.advance + layoutParameters.interGlyphExtraAdvance);
- }
+ TraversesCharactersForGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+ layoutParameters.textModel->mLogicalModel->mText.Begin(),
+ layoutParameters.startGlyphIndex,
+ layoutParameters.interGlyphExtraAdvance,
+ bidiLine.characterRunForSecondHalfLine,
+ bidiLine.visualToLogicalMapSecondHalf,
+ glyphPositionsBuffer,
+ characterLogicalIndex,
+ penX);
}
+
+ characterLogicalIndex = extendedToSecondHalf ? characterLogicalIndex : 0u;
+
+ TraversesCharactersForGlyphPositionsRTL(layoutParameters.textModel->mVisualModel,
+ layoutParameters.textModel->mLogicalModel->mText.Begin(),
+ layoutParameters.startGlyphIndex,
+ layoutParameters.interGlyphExtraAdvance,
+ bidiLine.characterRun,
+ bidiLine.visualToLogicalMap,
+ glyphPositionsBuffer,
+ characterLogicalIndex,
+ penX);
}
/**
* @param[in] penY The vertical layout position.
* @param[in] currentParagraphDirection The current paragraph's direction.
* @param[in,out] isAutoScrollEnabled If the isAutoScrollEnabled is true and the height of the text exceeds the boundaries of the control the text is elided and the isAutoScrollEnabled is set to false to disable the autoscroll
+ * @param[in] ellipsisPosition Where is the location the text elide
*
* return Whether the line is ellipsized.
*/
- bool EllipsisLine(const Parameters& layoutParameters,
- LayoutBidiParameters& layoutBidiParameters,
- const LineLayout& layout,
- Size& layoutSize,
- LineRun* linesBuffer,
- Vector2* glyphPositionsBuffer,
- Length& numberOfLines,
- float penY,
- bool& isAutoScrollEnabled)
+ bool EllipsisLine(const Parameters& layoutParameters,
+ LayoutBidiParameters& layoutBidiParameters,
+ const LineLayout& layout,
+ Size& layoutSize,
+ LineRun* linesBuffer,
+ Vector2* glyphPositionsBuffer,
+ Length& numberOfLines,
+ float penY,
+ bool& isAutoScrollEnabled,
+ bool isAutoScrollMaxTextureExceeded,
+ DevelText::EllipsisPosition::Type ellipsisPosition,
+ bool enforceEllipsisInSingleLine)
{
- const bool ellipsis = isAutoScrollEnabled ? (penY - layout.descender > layoutParameters.boundingBox.height) : ((penY - layout.descender > layoutParameters.boundingBox.height) || ((mLayout == SINGLE_LINE_BOX) && (layout.length > layoutParameters.boundingBox.width)));
-
- if(ellipsis)
+ const bool ellipsis = enforceEllipsisInSingleLine || (isAutoScrollEnabled ? isAutoScrollMaxTextureExceeded : ((penY - layout.descender > layoutParameters.boundingBox.height) || ((mLayout == SINGLE_LINE_BOX) && (layout.length > layoutParameters.boundingBox.width))));
+ const bool isMultiline = !enforceEllipsisInSingleLine && (mLayout == MULTI_LINE_BOX);
+ if(ellipsis && (ellipsisPosition == DevelText::EllipsisPosition::END || !isMultiline))
{
- isAutoScrollEnabled = false;
- // Do not layout more lines if ellipsis is enabled.
+ if(penY - layout.descender > layoutParameters.boundingBox.height)
+ {
+ // Even if auto scroll is enabled and text is bigger than max texture size,
+ // if the the height is small, auto scroll should not work.
+ isAutoScrollEnabled = false;
+ }
+ // Do not layout more lines if ellipsis is enabled.
// The last line needs to be completely filled with characters.
// Part of a word may be used.
LineRun* lineRun = nullptr;
LineLayout ellipsisLayout;
+
+ ellipsisLayout.relativeLineSize = layout.relativeLineSize;
+
if(0u != numberOfLines)
{
// Get the last line and layout it again with the 'completelyFill' flag to true.
lineRun = linesBuffer + (numberOfLines - 1u);
-
penY -= layout.ascender - lineRun->descender + lineRun->lineSpacing;
ellipsisLayout.glyphIndex = lineRun->glyphRun.glyphIndex;
lineRun->glyphRun.glyphIndex = 0u;
ellipsisLayout.glyphIndex = 0u;
+ lineRun->isSplitToTwoHalves = false;
++numberOfLines;
}
GetLineLayoutForBox(layoutParameters,
layoutBidiParameters,
ellipsisLayout,
+ true,
+ ellipsisPosition,
+ enforceEllipsisInSingleLine,
true);
+ if(ellipsisPosition == DevelText::EllipsisPosition::START && !isMultiline)
+ {
+ lineRun->glyphRun.glyphIndex = ellipsisLayout.glyphIndex;
+ }
+
lineRun->glyphRun.numberOfGlyphs = ellipsisLayout.numberOfGlyphs;
lineRun->characterRun.characterIndex = ellipsisLayout.characterIndex;
lineRun->characterRun.numberOfCharacters = ellipsisLayout.numberOfCharacters;
lineRun->descender = ellipsisLayout.descender;
lineRun->ellipsis = true;
+ lineRun->isSplitToTwoHalves = ellipsisLayout.isSplitToTwoHalves;
+ lineRun->glyphRunSecondHalf.glyphIndex = ellipsisLayout.glyphIndexInSecondHalfLine;
+ lineRun->glyphRunSecondHalf.numberOfGlyphs = ellipsisLayout.numberOfGlyphsInSecondHalfLine;
+ lineRun->characterRunForSecondHalfLine.characterIndex = ellipsisLayout.characterIndexInSecondHalfLine;
+ lineRun->characterRunForSecondHalfLine.numberOfCharacters = ellipsisLayout.numberOfCharactersInSecondHalfLine;
+
layoutSize.width = layoutParameters.boundingBox.width;
if(layoutSize.height < Math::MACHINE_EPSILON_1000)
{
- layoutSize.height += (lineRun->ascender + -lineRun->descender) + lineRun->lineSpacing;
+ layoutSize.height += GetLineHeight(*lineRun, true);
+ }
+ else
+ {
+ //when we apply ellipsis, the last line should not take negative linespacing into account for layoutSize.height calculation
+ //usually we don't includ it in normal cases using GetLineHeight()
+ if(lineRun->lineSpacing < 0)
+ {
+ layoutSize.height -= lineRun->lineSpacing;
+ }
}
-
- const GlyphInfo* const glyphsBuffer = layoutParameters.textModel->mVisualModel->mGlyphs.Begin();
- const float outlineWidth = static_cast<float>(layoutParameters.textModel->GetOutlineWidth());
const Vector<BidirectionalLineInfoRun>& bidirectionalLinesInfo = layoutParameters.textModel->mLogicalModel->mBidirectionalLineInfo;
++it, ++layoutBidiParameters.bidiLineIndex)
{
const BidirectionalLineInfoRun& run = *it;
-
- if(ellipsisLayout.characterIndex == run.characterRun.characterIndex)
+ //To handle case when the laid characters exist in next line.
+ //More than one BidirectionalLineInfoRun could start with same character.
+ //When need to check also numberOfCharacters in line.
+ //Note: This fixed the incorrect view of extra spaces of RTL as in Arabic then view ellipsis glyph
+ if(ellipsisLayout.characterIndex == run.characterRun.characterIndex &&
+ ellipsisLayout.numberOfCharacters == run.characterRun.numberOfCharacters &&
+ ellipsisLayout.characterIndexInSecondHalfLine == run.characterRunForSecondHalfLine.characterIndex &&
+ ellipsisLayout.numberOfCharactersInSecondHalfLine == run.characterRunForSecondHalfLine.numberOfCharacters)
{
// Found where to insert the bidi line info.
break;
else
{
lineRun->direction = LTR;
- SetGlyphPositions(glyphsBuffer + lineRun->glyphRun.glyphIndex,
- ellipsisLayout.numberOfGlyphs,
- outlineWidth,
- layoutParameters.interGlyphExtraAdvance,
- glyphPositionsBuffer + lineRun->glyphRun.glyphIndex - layoutParameters.startGlyphIndex);
+ SetGlyphPositions(layoutParameters,
+ glyphPositionsBuffer,
+ ellipsisLayout);
}
}
lineRun.width = layout.length;
lineRun.extraLength = std::ceil(layout.whiteSpaceLengthEndOfLine);
+ lineRun.isSplitToTwoHalves = layout.isSplitToTwoHalves;
+ lineRun.glyphRunSecondHalf.glyphIndex = layout.glyphIndexInSecondHalfLine;
+ lineRun.glyphRunSecondHalf.numberOfGlyphs = layout.numberOfGlyphsInSecondHalfLine;
+ lineRun.characterRunForSecondHalfLine.characterIndex = layout.characterIndexInSecondHalfLine;
+ lineRun.characterRunForSecondHalfLine.numberOfCharacters = layout.numberOfCharactersInSecondHalfLine;
+
// Rounds upward to avoid a non integer size.
lineRun.width = std::ceil(lineRun.width);
lineRun.direction = layout.direction;
lineRun.ellipsis = false;
- lineRun.lineSpacing = mDefaultLineSize - (lineRun.ascender + -lineRun.descender);
- lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing;
-
- lineRun.lineSpacing += mDefaultLineSpacing;
+ lineRun.lineSpacing = GetLineSpacing(lineRun.ascender + -lineRun.descender, layout.relativeLineSize);
// Update the actual size.
if(lineRun.width > layoutSize.width)
layoutSize.width = lineRun.width;
}
- layoutSize.height += (lineRun.ascender + -lineRun.descender) + lineRun.lineSpacing;
+ layoutSize.height += GetLineHeight(lineRun, isLastLine);
}
/**
lineRun.direction = LTR;
lineRun.ellipsis = false;
- lineRun.lineSpacing = mDefaultLineSize - (lineRun.ascender + -lineRun.descender);
- lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing;
+ BoundedParagraphRun currentParagraphRun;
+ LineLayout tempLineLayout;
+ (GetBoundedParagraph(layoutParameters.textModel->GetBoundedParagraphRuns(), characterIndex, currentParagraphRun) ? SetRelativeLineSize(¤tParagraphRun, tempLineLayout) : SetRelativeLineSize(nullptr, tempLineLayout));
- lineRun.lineSpacing += mDefaultLineSpacing;
+ lineRun.lineSpacing = GetLineSpacing(lineRun.ascender + -lineRun.descender, tempLineLayout.relativeLineSize);
- layoutSize.height += (lineRun.ascender + -lineRun.descender) + lineRun.lineSpacing;
+ layoutSize.height += GetLineHeight(lineRun, true);
}
/**
it != endIt;
++it)
{
- const LineRun& line = *it;
+ const LineRun& line = *it;
+ bool isLastLine = (it + 1 == endIt);
if(line.width > layoutSize.width)
{
layoutSize.width = line.width;
}
- layoutSize.height += (line.ascender + -line.descender) + line.lineSpacing;
+ layoutSize.height += GetLineHeight(line, isLastLine);
}
}
}
}
- bool LayoutText(Parameters& layoutParameters,
- Size& layoutSize,
- bool elideTextEnabled,
- bool& isAutoScrollEnabled)
+ /**
+ * @brief Sets the relative line size for the LineLayout
+ *
+ * @param[in] currentParagraphRun Contains the bounded paragraph for this line layout.
+ * @param[in,out] lineLayout The line layout to be updated.
+ */
+ void SetRelativeLineSize(BoundedParagraphRun* currentParagraphRun, LineLayout& lineLayout)
+ {
+ lineLayout.relativeLineSize = mRelativeLineSize;
+
+ if(currentParagraphRun != nullptr && currentParagraphRun->relativeLineSizeDefined)
+ {
+ lineLayout.relativeLineSize = currentParagraphRun->relativeLineSize;
+ }
+ }
+
+ /**
+ * @brief Get the bounded paragraph for the characterIndex if exists.
+ *
+ * @param[in] boundedParagraphRuns The bounded paragraph list to search in.
+ * @param[in] characterIndex The character index to get bounded paragraph for.
+ * @param[out] currentParagraphRun Contains the bounded paragraph if found for the characterIndex.
+ *
+ * @return returns true if a bounded paragraph was found.
+ */
+ bool GetBoundedParagraph(const Vector<BoundedParagraphRun> boundedParagraphRuns, CharacterIndex characterIndex, BoundedParagraphRun& currentParagraphRun)
+ {
+ for(Vector<BoundedParagraphRun>::Iterator it = boundedParagraphRuns.Begin(),
+ endIt = boundedParagraphRuns.End();
+ it != endIt;
+ ++it)
+ {
+ BoundedParagraphRun& tempParagraphRun = *it;
+
+ if(characterIndex >= tempParagraphRun.characterRun.characterIndex &&
+ characterIndex < (tempParagraphRun.characterRun.characterIndex + tempParagraphRun.characterRun.numberOfCharacters))
+ {
+ currentParagraphRun = tempParagraphRun;
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ bool LayoutText(Parameters& layoutParameters,
+ Size& layoutSize,
+ bool elideTextEnabled,
+ bool& isAutoScrollEnabled,
+ bool isAutoScrollMaxTextureExceeded,
+ DevelText::EllipsisPosition::Type ellipsisPosition)
{
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);
layoutParameters.textModel->mVisualModel->mHyphen.glyph.Clear();
layoutParameters.textModel->mVisualModel->mHyphen.index.Clear();
- Vector<LineRun>& lines = layoutParameters.textModel->mVisualModel->mLines;
+ //Reset indices of ElidedGlyphs
+ layoutParameters.textModel->mVisualModel->SetStartIndexOfElidedGlyphs(0u);
+ layoutParameters.textModel->mVisualModel->SetEndIndexOfElidedGlyphs(layoutParameters.textModel->GetNumberOfGlyphs() - 1u);
+ layoutParameters.textModel->mVisualModel->SetFirstMiddleIndexOfElidedGlyphs(0u);
+ layoutParameters.textModel->mVisualModel->SetSecondMiddleIndexOfElidedGlyphs(0u);
+
+ Vector<LineRun>& lines = layoutParameters.textModel->mVisualModel->mLines;
+ const Vector<BoundedParagraphRun>& boundedParagraphRuns = layoutParameters.textModel->GetBoundedParagraphRuns();
if(0u == layoutParameters.numberOfGlyphs)
{
// Retrieve BiDi info.
const bool hasBidiParagraphs = !layoutParameters.textModel->mLogicalModel->mBidirectionalParagraphInfo.Empty();
- const CharacterIndex* const glyphsToCharactersBuffer = hasBidiParagraphs ? layoutParameters.textModel->mVisualModel->mGlyphsToCharacters.Begin() : nullptr;
+ const CharacterIndex* const glyphsToCharactersBuffer = layoutParameters.textModel->mVisualModel->mGlyphsToCharacters.Begin();
const Vector<BidirectionalParagraphInfoRun>& bidirectionalParagraphsInfo = layoutParameters.textModel->mLogicalModel->mBidirectionalParagraphInfo;
const Vector<BidirectionalLineInfoRun>& bidirectionalLinesInfo = layoutParameters.textModel->mLogicalModel->mBidirectionalLineInfo;
linesBuffer = lines.Begin();
}
- float penY = CalculateLineOffset(lines,
+ float penY = CalculateLineOffset(lines,
layoutParameters.startLineIndex);
+ bool anyLineIsEliped = false;
for(GlyphIndex index = layoutParameters.startGlyphIndex; index < lastGlyphPlusOne;)
{
layoutBidiParameters.Clear();
LineLayout layout;
layout.direction = layoutBidiParameters.paragraphDirection;
layout.glyphIndex = index;
+
+ BoundedParagraphRun currentParagraphRun;
+ (GetBoundedParagraph(boundedParagraphRuns, *(glyphsToCharactersBuffer + index), currentParagraphRun) ? SetRelativeLineSize(¤tParagraphRun, layout) : SetRelativeLineSize(nullptr, layout));
+
GetLineLayoutForBox(layoutParameters,
layoutBidiParameters,
layout,
- false);
+ false,
+ ellipsisPosition,
+ false,
+ elideTextEnabled);
DALI_LOG_INFO(gLogFilter, Debug::Verbose, " glyph index %d\n", layout.glyphIndex);
DALI_LOG_INFO(gLogFilter, Debug::Verbose, " character index %d\n", layout.characterIndex);
DALI_LOG_INFO(gLogFilter, Debug::Verbose, " number of characters %d\n", layout.numberOfCharacters);
DALI_LOG_INFO(gLogFilter, Debug::Verbose, " length %f\n", layout.length);
- if(0u == layout.numberOfGlyphs)
+ CharacterIndex lastCharacterInParagraph = currentParagraphRun.characterRun.characterIndex + currentParagraphRun.characterRun.numberOfCharacters - 1;
+
+ //check if this is the last line in paragraph, if false we should use the default relative line size (the one set using the property)
+ if(lastCharacterInParagraph >= layout.characterIndex && lastCharacterInParagraph < layout.characterIndex + layout.numberOfCharacters)
+ {
+ layout.relativeLineSize = mRelativeLineSize;
+ }
+
+ if(0u == layout.numberOfGlyphs + layout.numberOfGlyphsInSecondHalfLine)
{
// The width is too small and no characters are laid-out.
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--LayoutText width too small!\n\n");
glyphPositionsBuffer,
numberOfLines,
penY,
- isAutoScrollEnabled);
+ isAutoScrollEnabled,
+ isAutoScrollMaxTextureExceeded,
+ ellipsisPosition,
+ false);
}
- if(ellipsis)
+ if(ellipsis && ((ellipsisPosition == DevelText::EllipsisPosition::END) || (numberOfLines == 1u)))
{
+ const bool isMultiline = mLayout == MULTI_LINE_BOX;
+ if(isMultiline && ellipsisPosition != DevelText::EllipsisPosition::END)
+ {
+ ellipsis = EllipsisLine(layoutParameters,
+ layoutBidiParameters,
+ layout,
+ layoutSize,
+ linesBuffer,
+ glyphPositionsBuffer,
+ numberOfLines,
+ penY,
+ isAutoScrollEnabled,
+ isAutoScrollMaxTextureExceeded,
+ ellipsisPosition,
+ true);
+ }
+
//clear hyphen from ellipsis line
const Length* hyphenIndices = layoutParameters.textModel->mVisualModel->mHyphen.index.Begin();
Length hyphensCount = layoutParameters.textModel->mVisualModel->mHyphen.glyph.Size();
}
else
{
+ //In START location of ellipsis whether to shift lines or not.
+ anyLineIsEliped |= ellipsis;
+
// Whether the last line has been laid-out.
- const bool isLastLine = index + layout.numberOfGlyphs == totalNumberOfGlyphs;
+ const bool isLastLine = index + (layout.numberOfGlyphs + layout.numberOfGlyphsInSecondHalfLine) == totalNumberOfGlyphs;
if(numberOfLines == linesCapacity)
{
numberOfLines,
isLastLine);
- const GlyphIndex nextIndex = index + layout.numberOfGlyphs;
+ const GlyphIndex nextIndex = index + layout.numberOfGlyphs + layout.numberOfGlyphsInSecondHalfLine;
if((nextIndex == totalNumberOfGlyphs) &&
layoutParameters.isLastNewParagraph &&
}
UpdateTextLayout(layoutParameters,
- layout.characterIndex + layout.numberOfCharacters,
- index + layout.numberOfGlyphs,
+ layout.characterIndex + (layout.numberOfCharacters + layout.numberOfCharactersInSecondHalfLine),
+ index + (layout.numberOfGlyphs + layout.numberOfGlyphsInSecondHalfLine),
layoutSize,
linesBuffer,
numberOfLines);
} // whether to add a last line.
- const GlyphInfo* const glyphsBuffer = layoutParameters.textModel->mVisualModel->mGlyphs.Begin();
- const float outlineWidth = static_cast<float>(layoutParameters.textModel->GetOutlineWidth());
-
const BidirectionalLineInfoRun* const bidirectionalLineInfo = (layoutBidiParameters.isBidirectional && !bidirectionalLinesInfo.Empty()) ? &bidirectionalLinesInfo[layoutBidiParameters.bidiLineIndex] : nullptr;
if((nullptr != bidirectionalLineInfo) &&
else
{
// Sets the positions of the glyphs.
- SetGlyphPositions(glyphsBuffer + index,
- layout.numberOfGlyphs,
- outlineWidth,
- layoutParameters.interGlyphExtraAdvance,
- glyphPositionsBuffer + index - layoutParameters.startGlyphIndex);
+ SetGlyphPositions(layoutParameters,
+ glyphPositionsBuffer,
+ layout);
}
// Updates the vertical pen's position.
- penY += -layout.descender + layout.lineSpacing + mDefaultLineSpacing;
- // If there is a defaultLineSize, updates the pen's position.
- if(mDefaultLineSize > 0.f)
- {
- float lineSpacing = mDefaultLineSize - (layout.ascender + -layout.descender);
- lineSpacing = lineSpacing < 0.f ? 0.f : lineSpacing;
- penY += lineSpacing;
- }
+ penY += -layout.descender + layout.lineSpacing + GetLineSpacing(layout.ascender + -layout.descender, layout.relativeLineSize);
// Increase the glyph index.
index = nextIndex;
} // no ellipsis
} // end for() traversing glyphs.
+ //Shift lines to up if ellipsis and multilines and set ellipsis of first line to true
+ if(anyLineIsEliped && numberOfLines > 1u)
+ {
+ if(ellipsisPosition == DevelText::EllipsisPosition::START)
+ {
+ Length lineIndex = 0;
+ while(lineIndex < numberOfLines && layoutParameters.boundingBox.height < layoutSize.height)
+ {
+ LineRun& delLine = linesBuffer[lineIndex];
+ delLine.ellipsis = true;
+
+ layoutSize.height -= (delLine.ascender + -delLine.descender) + delLine.lineSpacing;
+ for(Length lineIndex = 0; lineIndex < numberOfLines - 1; lineIndex++)
+ {
+ linesBuffer[lineIndex] = linesBuffer[lineIndex + 1];
+ linesBuffer[lineIndex].ellipsis = false;
+ }
+ numberOfLines--;
+ }
+ linesBuffer[0u].ellipsis = true;
+ }
+ else if(ellipsisPosition == DevelText::EllipsisPosition::MIDDLE)
+ {
+ Length middleLineIndex = (numberOfLines) / 2u;
+ Length ellipsisLineIndex = 0u;
+ while(1u < numberOfLines && 0u < middleLineIndex && layoutParameters.boundingBox.height < layoutSize.height)
+ {
+ LineRun& delLine = linesBuffer[middleLineIndex];
+ delLine.ellipsis = true;
+
+ layoutSize.height -= (delLine.ascender + -delLine.descender) + delLine.lineSpacing;
+ for(Length lineIndex = middleLineIndex; lineIndex < numberOfLines - 1; lineIndex++)
+ {
+ linesBuffer[lineIndex] = linesBuffer[lineIndex + 1];
+ linesBuffer[lineIndex].ellipsis = false;
+ }
+ numberOfLines--;
+ ellipsisLineIndex = middleLineIndex - 1u;
+ middleLineIndex = (numberOfLines) / 2u;
+ }
+
+ linesBuffer[ellipsisLineIndex].ellipsis = true;
+ }
+ }
+
if(updateCurrentBuffer)
{
glyphPositions.Insert(glyphPositions.Begin() + layoutParameters.startGlyphIndex,
Vector<LineRun>& lines,
float& alignmentOffset,
Dali::LayoutDirection::Type layoutDirection,
- bool matchSystemLanguageDirection)
+ bool matchLayoutDirection)
{
const CharacterIndex lastCharacterPlusOne = startIndex + numberOfCharacters;
horizontalAlignment,
line,
layoutDirection,
- matchSystemLanguageDirection);
+ matchLayoutDirection);
// Updates the alignment offset.
alignmentOffset = std::min(alignmentOffset, line.alignmentOffset);
HorizontalAlignment::Type horizontalAlignment,
LineRun& line,
Dali::LayoutDirection::Type layoutDirection,
- bool matchSystemLanguageDirection)
+ bool matchLayoutDirection)
{
line.alignmentOffset = 0.f;
const bool isLineRTL = RTL == line.direction;
float lineLength = line.width;
// match align for system language direction
- if(matchSystemLanguageDirection)
+ if(matchLayoutDirection)
{
// Swap the alignment type if the line is right to left.
isLayoutRTL = layoutDirection == LayoutDirection::RIGHT_TO_LEFT;
void Initialize(LineRun& line)
{
- line.glyphRun.glyphIndex = 0u;
- line.glyphRun.numberOfGlyphs = 0u;
- line.characterRun.characterIndex = 0u;
- line.characterRun.numberOfCharacters = 0u;
- line.width = 0.f;
- line.ascender = 0.f;
- line.descender = 0.f;
- line.extraLength = 0.f;
- line.alignmentOffset = 0.f;
- line.direction = LTR;
- line.ellipsis = false;
- line.lineSpacing = mDefaultLineSpacing;
+ line.glyphRun.glyphIndex = 0u;
+ line.glyphRun.numberOfGlyphs = 0u;
+ line.characterRun.characterIndex = 0u;
+ line.characterRun.numberOfCharacters = 0u;
+ line.width = 0.f;
+ line.ascender = 0.f;
+ line.descender = 0.f;
+ line.extraLength = 0.f;
+ line.alignmentOffset = 0.f;
+ line.direction = LTR;
+ line.ellipsis = false;
+ line.lineSpacing = mDefaultLineSpacing;
+ line.isSplitToTwoHalves = false;
+ line.glyphRunSecondHalf.glyphIndex = 0u;
+ line.glyphRunSecondHalf.numberOfGlyphs = 0u;
+ line.characterRunForSecondHalfLine.characterIndex = 0u;
+ line.characterRunForSecondHalfLine.numberOfCharacters = 0u;
}
Type mLayout;
float mDefaultLineSize;
IntrusivePtr<Metrics> mMetrics;
+ float mRelativeLineSize;
};
Engine::Engine()
return static_cast<int>(mImpl->mCursorWidth);
}
-bool Engine::LayoutText(Parameters& layoutParameters,
- Size& layoutSize,
- bool elideTextEnabled,
- bool& isAutoScrollEnabled)
+bool Engine::LayoutText(Parameters& layoutParameters,
+ Size& layoutSize,
+ bool elideTextEnabled,
+ bool& isAutoScrollEnabled,
+ bool isAutoScrollMaxTextureExceeded,
+ DevelText::EllipsisPosition::Type ellipsisPosition)
{
return mImpl->LayoutText(layoutParameters,
layoutSize,
elideTextEnabled,
- isAutoScrollEnabled);
+ isAutoScrollEnabled,
+ isAutoScrollMaxTextureExceeded,
+ ellipsisPosition);
}
void Engine::Align(const Size& size,
Vector<LineRun>& lines,
float& alignmentOffset,
Dali::LayoutDirection::Type layoutDirection,
- bool matchSystemLanguageDirection)
+ bool matchLayoutDirection)
{
mImpl->Align(size,
startIndex,
lines,
alignmentOffset,
layoutDirection,
- matchSystemLanguageDirection);
+ matchLayoutDirection);
}
void Engine::SetDefaultLineSpacing(float lineSpacing)
return mImpl->mDefaultLineSize;
}
+void Engine::SetRelativeLineSize(float relativeLineSize)
+{
+ mImpl->mRelativeLineSize = relativeLineSize;
+}
+
+float Engine::GetRelativeLineSize() const
+{
+ return mImpl->mRelativeLineSize;
+}
+
} // namespace Layout
} // namespace Text
projects / platform / core / uifw / dali-toolkit.git / blobdiff