Length numberOfCharacters; ///< The number of characters which fit in one line.
Length numberOfGlyphs; ///< The number of glyph which fit in one line.
float length; ///< The length of the glyphs which fit in one line.
+ float widthAdvanceDiff; ///< The difference between the width and the advance of the last glyph.
float wsLengthEndOfLine; ///< The length of the white spaces at the end of the line.
- float height; ///< The maximum height of all fonts in the line.
float ascender; ///< The maximum ascender of all fonts in the line.
+ float descender; ///< The maximum descender of all fonts in the line.
};
struct LayoutEngine::Impl
{
Impl()
: mLayout( LayoutEngine::SINGLE_LINE_BOX ),
- mAlignment( LayoutEngine::ALIGN_BEGIN )
+ mHorizontalAlignment( LayoutEngine::HORIZONTAL_ALIGN_BEGIN ),
+ mVerticalAlignment( LayoutEngine::VERTICAL_ALIGN_TOP )
{
mFontClient = TextAbstraction::FontClient::Get();
}
lineLayout.numberOfGlyphs = 0u;
lineLayout.length = 0.f;
lineLayout.wsLengthEndOfLine = 0.f;
- lineLayout.height = 0.f;
lineLayout.ascender = 0.f;
+ lineLayout.descender = 0.f;
// Get the last glyph index.
const GlyphIndex lastGlyphIndex = parameters.totalNumberOfGlyphs - 1u;
Text::FontMetrics fontMetrics;
mFontClient.GetFontMetrics( glyphInfo.fontId, fontMetrics );
- // Sets the maximum height.
- if( fontMetrics.height > lineLayout.height )
- {
- lineLayout.height = fontMetrics.height;
- }
-
// Sets the maximum ascender.
if( fontMetrics.ascender > lineLayout.ascender )
{
lineLayout.ascender = fontMetrics.ascender;
}
+ // Sets the maximum descender.
+ if( fontMetrics.descender > lineLayout.descender )
+ {
+ lineLayout.descender = fontMetrics.descender;
+ }
+
lastFontId = glyphInfo.fontId;
}
}
lineLayout.numberOfCharacters = 0u;
lineLayout.numberOfGlyphs = 0u;
lineLayout.length = 0.f;
+ lineLayout.widthAdvanceDiff = 0.f;
lineLayout.wsLengthEndOfLine = 0.f;
- lineLayout.height = 0.f;
lineLayout.ascender = 0.f;
+ lineLayout.descender = 0.f;
// Stores temporary line layout which has not been added to the final line layout.
LineLayout tmpLineLayout;
tmpLineLayout.numberOfCharacters = 0u;
tmpLineLayout.numberOfGlyphs = 0u;
tmpLineLayout.length = 0.f;
+ tmpLineLayout.widthAdvanceDiff = 0.f;
tmpLineLayout.wsLengthEndOfLine = 0.f;
- tmpLineLayout.height = 0.f;
tmpLineLayout.ascender = 0.f;
-
- // Get the last glyph index.
- const GlyphIndex lastGlyphIndex = parameters.totalNumberOfGlyphs - 1u;
+ tmpLineLayout.descender = 0.f;
FontId lastFontId = 0u;
for( GlyphIndex glyphIndex = lineLayout.glyphIndex;
{
// Add the length to the length of white spaces at the end of the line.
tmpLineLayout.wsLengthEndOfLine += glyphInfo.advance; // I use the advance as the width is always zero for the white spaces.
+ tmpLineLayout.widthAdvanceDiff = 0.f;
}
else
{
// Add as well any previous white space length.
- tmpLineLayout.length += tmpLineLayout.wsLengthEndOfLine + ( glyphIndex == lastGlyphIndex ) ? glyphInfo.width : glyphInfo.advance;
+ tmpLineLayout.length += tmpLineLayout.wsLengthEndOfLine + glyphInfo.advance;
+ tmpLineLayout.widthAdvanceDiff = glyphInfo.width - glyphInfo.advance;
// Clear the white space length at the end of the line.
tmpLineLayout.wsLengthEndOfLine = 0.f;
}
// Check if the accumulated length fits in the width of the box.
- if( lineLayout.length + tmpLineLayout.length + ( ( 0.f < tmpLineLayout.length ) ? lineLayout.wsLengthEndOfLine : 0.f ) > parameters.boundingBox.width )
+ if( lineLayout.length + tmpLineLayout.length + tmpLineLayout.widthAdvanceDiff + ( ( 0.f < tmpLineLayout.length ) ? lineLayout.wsLengthEndOfLine : 0.f ) > parameters.boundingBox.width )
{
// Current word does not fit in the box's width.
return;
lineLayout.numberOfCharacters += tmpLineLayout.numberOfCharacters;
lineLayout.numberOfGlyphs += tmpLineLayout.numberOfGlyphs;
lineLayout.length += tmpLineLayout.length;
+ lineLayout.widthAdvanceDiff = tmpLineLayout.widthAdvanceDiff;
if( 0.f < tmpLineLayout.length )
{
lineLayout.wsLengthEndOfLine += tmpLineLayout.wsLengthEndOfLine;
}
- if( tmpLineLayout.height > lineLayout.height )
+ if( tmpLineLayout.ascender > lineLayout.ascender )
{
- lineLayout.height = tmpLineLayout.height;
+ lineLayout.ascender = tmpLineLayout.ascender;
}
- if( tmpLineLayout.ascender > lineLayout.ascender )
+ if( tmpLineLayout.descender > lineLayout.descender )
{
- lineLayout.ascender = tmpLineLayout.ascender;
+ lineLayout.descender = tmpLineLayout.descender;
}
tmpLineLayout.numberOfCharacters = 0u;
tmpLineLayout.numberOfGlyphs = 0u;
tmpLineLayout.length = 0u;
+ tmpLineLayout.widthAdvanceDiff = 0u;
tmpLineLayout.wsLengthEndOfLine = 0u;
- tmpLineLayout.height = 0.f;
tmpLineLayout.ascender = 0.f;
+ tmpLineLayout.descender = 0.f;
return;
}
lineLayout.numberOfCharacters += tmpLineLayout.numberOfCharacters;
lineLayout.numberOfGlyphs += tmpLineLayout.numberOfGlyphs;
lineLayout.length += tmpLineLayout.length;
+ lineLayout.widthAdvanceDiff = tmpLineLayout.widthAdvanceDiff;
+
if( 0.f < tmpLineLayout.length )
{
lineLayout.length += lineLayout.wsLengthEndOfLine;
lineLayout.wsLengthEndOfLine += tmpLineLayout.wsLengthEndOfLine;
}
- if( tmpLineLayout.height > lineLayout.height )
+ if( tmpLineLayout.ascender > lineLayout.ascender )
{
- lineLayout.height = tmpLineLayout.height;
+ lineLayout.ascender = tmpLineLayout.ascender;
}
- if( tmpLineLayout.ascender > lineLayout.ascender )
+ if( tmpLineLayout.descender > lineLayout.descender )
{
- lineLayout.ascender = tmpLineLayout.ascender;
+ lineLayout.descender = tmpLineLayout.descender;
}
tmpLineLayout.numberOfCharacters = 0u;
tmpLineLayout.numberOfGlyphs = 0u;
tmpLineLayout.length = 0u;
+ tmpLineLayout.widthAdvanceDiff = 0u;
tmpLineLayout.wsLengthEndOfLine = 0u;
- tmpLineLayout.height = 0.f;
tmpLineLayout.ascender = 0.f;
+ tmpLineLayout.descender = 0.f;
}
if( lastFontId != glyphInfo.fontId )
Text::FontMetrics fontMetrics;
mFontClient.GetFontMetrics( glyphInfo.fontId, fontMetrics );
- // Sets the maximum height.
- if( fontMetrics.height > tmpLineLayout.height )
- {
- tmpLineLayout.height = fontMetrics.height;
- }
-
// Sets the maximum ascender.
if( fontMetrics.ascender > tmpLineLayout.ascender )
{
tmpLineLayout.ascender = fontMetrics.ascender;
}
+ // Sets the maximum descender.
+ if( -fontMetrics.descender > tmpLineLayout.descender )
+ {
+ tmpLineLayout.descender = -fontMetrics.descender;
+ }
+
lastFontId = glyphInfo.fontId;
}
}
void ReLayoutRightToLeftLines( const LayoutParameters& layoutParameters,
Vector<Vector2>& glyphPositions )
{
+ // Traverses the paragraphs with right to left characters.
for( LineIndex lineIndex = 0u; lineIndex < layoutParameters.numberOfBidirectionalInfoRuns; ++lineIndex )
{
- const BidirectionalLineInfoRun& bidiLine = *( layoutParameters.lineBidirectionalInfoRunsBuffer +lineIndex );
+ const BidirectionalLineInfoRun& bidiLine = *( layoutParameters.lineBidirectionalInfoRunsBuffer + lineIndex );
float penX = 0.f;
Vector2* glyphPositionsBuffer = glyphPositions.Begin();
+ // Traverses the characters of the right to left paragraph.
for( CharacterIndex characterLogicalIndex = 0u;
characterLogicalIndex < bidiLine.characterRun.numberOfCharacters;
++characterLogicalIndex )
for( GlyphIndex index = 0u; index < numberOfGlyphs; ++index )
{
// Convert the character in the visual order into the glyph in the visual order.
- GlyphIndex glyphIndex = 1u + *( layoutParameters.charactersToGlyphsBuffer + characterVisualIndex + index ) - numberOfGlyphs;
+ const GlyphIndex glyphIndex = *( layoutParameters.charactersToGlyphsBuffer + characterVisualIndex ) + index;
+
+ DALI_ASSERT_DEBUG( 0u <= glyphIndex && glyphIndex < layoutParameters.totalNumberOfGlyphs );
const GlyphInfo& glyph = *( layoutParameters.glyphsBuffer + glyphIndex );
Vector2& position = *( glyphPositionsBuffer + glyphIndex );
}
void Align( const LayoutParameters& layoutParameters,
+ const Size& layoutSize,
const Vector<LineRun>& lines,
Vector<Vector2>& glyphPositions )
{
// 2) Calculate the alignment offset accordingly with the align option,
// the box width, line length, and the paragraphs direction.
- float alignOffset = CalculateAlignment( layoutParameters.boundingBox.width,
- line.lineSize.width,
- line.extraLength,
- paragraphDirection );
+ float alignOffset = CalculateHorizontalAlignment( layoutSize.width,
+ line.lineSize.width,
+ line.extraLength,
+ paragraphDirection );
// 3) Traverse all glyphs and update the 'x' position.
for( GlyphIndex index = line.glyphIndex,
lineRun.characterRun.characterIndex = 0u;
lineRun.characterRun.numberOfCharacters = *( layoutParameters.glyphsToCharactersBuffer + lastGlyphIndex ) + *( layoutParameters.charactersPerGlyphBuffer + lastGlyphIndex );
lineRun.lineSize.width = layout.length;
- lineRun.lineSize.height = layout.height;
+ lineRun.lineSize.height = layout.ascender + layout.descender;
lineRun.extraLength = layout.wsLengthEndOfLine;
+ lineRun.direction = false;
lines.PushBack( lineRun );
// Update the actual size.
actualSize.width = layout.length;
- actualSize.height = layout.height;
+ actualSize.height = lineRun.lineSize.height;
float penX = 0.f;
- float penY = layout.height;
+ float penY = layout.ascender;
Vector2* glyphPositionsBuffer = glyphPositions.Begin();
for( GlyphIndex glyphIndex = 0u; glyphIndex < layout.numberOfGlyphs; ++glyphIndex )
lineRun.numberOfGlyphs = layout.numberOfGlyphs;
lineRun.characterRun.characterIndex = *( layoutParameters.glyphsToCharactersBuffer + index );
lineRun.characterRun.numberOfCharacters = ( *( layoutParameters.glyphsToCharactersBuffer + lastGlyphIndex ) + *( layoutParameters.charactersPerGlyphBuffer + lastGlyphIndex ) ) - lineRun.characterRun.characterIndex;
- lineRun.lineSize.width = layout.length;
- lineRun.lineSize.height = layout.height;
+ lineRun.lineSize.width = layout.length + ( ( layout.widthAdvanceDiff > 0.f ) ? layout.widthAdvanceDiff : 0.f );
+ lineRun.lineSize.height = layout.ascender + layout.descender;
lineRun.extraLength = layout.wsLengthEndOfLine;
+ lineRun.direction = false;
lines.PushBack( lineRun );
// Update the actual size.
- if( layout.length > actualSize.width )
+ if( layout.length + layout.widthAdvanceDiff > actualSize.width )
{
actualSize.width = layout.length;
}
- actualSize.height += layout.height;
+ actualSize.height += lineRun.lineSize.height;
// Traverse the glyphs and set the positions.
- penY += layout.height;
+ penY += layout.ascender;
Vector2* glyphPositionsBuffer = glyphPositions.Begin();
for( GlyphIndex i = index; i < index + layout.numberOfGlyphs; ++i )
penX += glyph.advance;
}
+ penY += layout.descender;
+
// Increase the glyph index.
index += layout.numberOfGlyphs;
}
return true;
}
- float CalculateAlignment( float boxWidth,
- float lineLength,
- float extraLength,
- bool paragraphDirection )
+ float CalculateHorizontalAlignment( float boxWidth,
+ float lineLength,
+ float extraLength,
+ bool paragraphDirection )
{
float offset = 0.f;
- Alignment alignment = mAlignment;
+ HorizontalAlignment alignment = mHorizontalAlignment;
if( paragraphDirection &&
- ( ALIGN_CENTER != alignment ) )
+ ( HORIZONTAL_ALIGN_CENTER != alignment ) )
{
- if( ALIGN_BEGIN == alignment )
+ if( HORIZONTAL_ALIGN_BEGIN == alignment )
{
- alignment = ALIGN_END;
+ alignment = HORIZONTAL_ALIGN_END;
}
else
{
- alignment = ALIGN_BEGIN;
+ alignment = HORIZONTAL_ALIGN_BEGIN;
}
}
switch( alignment )
{
- case ALIGN_BEGIN:
+ case HORIZONTAL_ALIGN_BEGIN:
{
offset = 0.f;
break;
}
- case ALIGN_CENTER:
+ case HORIZONTAL_ALIGN_CENTER:
{
offset = 0.5f * ( boxWidth - lineLength );
const int intOffset = static_cast<int>( offset ); // try to avoid pixel alignment.
offset = static_cast<float>( intOffset );
break;
}
- case ALIGN_END:
+ case HORIZONTAL_ALIGN_END:
{
offset = boxWidth - lineLength;
break;
}
LayoutEngine::Layout mLayout;
- LayoutEngine::Alignment mAlignment;
+ LayoutEngine::HorizontalAlignment mHorizontalAlignment;
+ LayoutEngine::VerticalAlignment mVerticalAlignment;
TextAbstraction::FontClient mFontClient;
};
return mImpl->mLayout;
}
-void LayoutEngine::SetAlignment( Alignment alignment )
+void LayoutEngine::SetHorizontalAlignment( HorizontalAlignment alignment )
+{
+ mImpl->mHorizontalAlignment = alignment;
+}
+
+LayoutEngine::HorizontalAlignment LayoutEngine::GetHorizontalAlignment() const
+{
+ return mImpl->mHorizontalAlignment;
+}
+
+void LayoutEngine::SetVerticalAlignment( VerticalAlignment alignment )
{
- mImpl->mAlignment = alignment;
+ mImpl->mVerticalAlignment = alignment;
}
-LayoutEngine::Alignment LayoutEngine::GetAlignment() const
+LayoutEngine::VerticalAlignment LayoutEngine::GetVerticalAlignment() const
{
- return mImpl->mAlignment;
+ return mImpl->mVerticalAlignment;
}
bool LayoutEngine::LayoutText( const LayoutParameters& layoutParameters,
}
void LayoutEngine::Align( const LayoutParameters& layoutParameters,
+ const Size& layoutSize,
const Vector<LineRun>& lines,
Vector<Vector2>& glyphPositions )
{
mImpl->Align( layoutParameters,
+ layoutSize,
lines,
glyphPositions );
}