fixed: various tab related line height issues

This commit is contained in:
daboe01
2016-09-15 22:26:20 +02:00
parent 13fad1ca47
commit dd4e044608
+5 -5
View File
@@ -300,9 +300,6 @@ var CPSystemTypesetterFactory,
currentFontLineHeight = ascent - descent + leading;
if (ascent > _lineBase)
_lineBase = ascent;
if (previousFont !== currentFont)
{
measuringRange = CPMakeRange(glyphIndex, 0);
@@ -315,6 +312,9 @@ var CPSystemTypesetterFactory,
if (currentFontLineHeight > _lineHeight)
_lineHeight = currentFontLineHeight;
if (ascent > _lineBase)
_lineBase = ascent;
lineRange.length++;
measuringRange.length++;
@@ -401,14 +401,14 @@ var CPSystemTypesetterFactory,
numLines++;
isNewline = NO;
_lineFragments = [];
_lineHeight = 0;
_lineBase = ascent;
}
_lineWidth = 0;
advancements = [];
currentAnchor = 0;
prevRangeWidth = 0;
_lineHeight = 0;
_lineBase = ascent;
lineRange = CPMakeRange(glyphIndex + 1, 0);
measuringRange = CPMakeRange(glyphIndex + 1, 0);
wrapRange = CPMakeRange(0, 0);