Merge pull request #12613 from Gillibald/fixes/lineHeight

Gillibald · web-flow · commit 06b336d55df1 · 2023-08-23T08:55:05.000Z
Allow setting a LineHeight that is smaller than the default
diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1282,10 +1282,7 @@ private TextLineMetrics CreateLineMetrics()
 
             if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))
             {
-                if (lineHeight > height)
-                {
-                    height = lineHeight;
-                }
+                height = lineHeight;
             }
 
             return new TextLineMetrics

Original file line number	Diff line number	Diff line change
`@@ -1282,10 +1282,7 @@ private TextLineMetrics CreateLineMetrics()`
`1282`	`1282`
`1283`	`1283`	`if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))`
`1284`	`1284`	`{`
`1285`		`- if (lineHeight > height)`
`1286`		`- {`
`1287`		`- height = lineHeight;`
`1288`		`- }`
	`1285`	`+ height = lineHeight;`
`1289`	`1286`	`}`
`1290`	`1287`
`1291`	`1288`	`return new TextLineMetrics`