X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Flayouts%2Flayout-engine.cpp;h=b27f6349ca64ed687b15d30156f970c815874202;hb=1d96cc43e6699102d9e93d9aaf515a155893ba0b;hp=077b5983c1a8c7747e70baabe15d993f59440705;hpb=2d59f0b716ea7f7c06de0732d3e4e78aea127de6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index 077b598..b27f634 100644 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -1881,7 +1881,7 @@ struct Engine::Impl linesBuffer[lineIndex].ellipsis = false; } numberOfLines--; - ellipsisLineIndex = middleLineIndex > 0u ? middleLineIndex - 1u : 0u; + ellipsisLineIndex = middleLineIndex - 1u; middleLineIndex = (numberOfLines) / 2u; } @@ -2071,18 +2071,23 @@ struct Engine::Impl 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;