use current line descent for calculated line height

odrobnik · odrobnik · commit 72af4a1777ce · 2012-03-18T12:45:48.000+01:00
diff --git a/Core/Source/DTCoreTextLayoutFrame.m b/Core/Source/DTCoreTextLayoutFrame.m
@@ -265,7 +265,7 @@ - (void)_buildLinesWithTypesetter
 		{
 			if (lineHeight==0)
 			{
-				lineHeight = previousLineMetrics.descent + currentLineMetrics.ascent;
+				lineHeight = currentLineMetrics.descent + currentLineMetrics.ascent;
 			}
 			
 			if (isAtBeginOfParagraph)
@@ -1210,7 +1210,7 @@ - (CGPoint)baselineOriginToPositionLine:(DTCoreTextLayoutLine *)line afterLine:(
 	// is absolute line height set?
 	if (lineHeight==0)
 	{
-		lineHeight = previousLine.descent + line.ascent + usedLeading;
+		lineHeight = line.descent + line.ascent + usedLeading;
 	}
 	
 	if ([self isLineLastInParagraph:previousLine])

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ - (void)_buildLinesWithTypesetter`
`265`	`265`	`{`
`266`	`266`	`if (lineHeight==0)`
`267`	`267`	`{`
`268`		`- lineHeight = previousLineMetrics.descent + currentLineMetrics.ascent;`
	`268`	`+ lineHeight = currentLineMetrics.descent + currentLineMetrics.ascent;`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`if (isAtBeginOfParagraph)`
`@@ -1210,7 +1210,7 @@ - (CGPoint)baselineOriginToPositionLine:(DTCoreTextLayoutLine *)line afterLine:(`
`1210`	`1210`	`// is absolute line height set?`
`1211`	`1211`	`if (lineHeight==0)`
`1212`	`1212`	`{`
`1213`		`- lineHeight = previousLine.descent + line.ascent + usedLeading;`
	`1213`	`+ lineHeight = line.descent + line.ascent + usedLeading;`
`1214`	`1214`	`}`
`1215`	`1215`
`1216`	`1216`	`if ([self isLineLastInParagraph:previousLine])`