From: Abdulleh Ghujeh Date: Mon, 28 Mar 2022 12:29:35 +0000 (+0300) Subject: fix linespacing calculation in TextLabel X-Git-Tag: dali_2.1.17~8^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=4004ce518172d141a2dc93621c1091f0b0cd7e1e fix linespacing calculation in TextLabel line spacing for current line should affect next line not the current one Change-Id: I0a650dc34aad2aa8d41b85bee7d0912553e8faa5 --- diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp index 9d58934..33df43d 100644 --- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp +++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp @@ -847,12 +847,6 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth, // Increases the vertical offset with the line's ascender. glyphData.verticalOffset += static_cast(line.ascender); - // Include line spacing after first line - if(lineIndex > 0u) - { - glyphData.verticalOffset += static_cast(line.lineSpacing); - } - // Retrieves the glyph's outline width float outlineWidth = static_cast(mModel->GetOutlineWidth()); @@ -1153,8 +1147,8 @@ Devel::PixelBuffer Typesetter::CreateImageBuffer(const unsigned int bufferWidth, DrawStrikethrough(bufferWidth, bufferHeight, glyphData, baseline, strikethroughStartingYPosition, maxStrikethroughHeight, lineExtentLeft, lineExtentRight, modelStrikethroughProperties, currentStrikethroughProperties, line); } - // Increases the vertical offset with the line's descender. - glyphData.verticalOffset += static_cast(-line.descender); + // Increases the vertical offset with the line's descender & line spacing. + glyphData.verticalOffset += static_cast(-line.descender+line.lineSpacing); } return glyphData.bitmapBuffer;