Merge pull request #2748 from cwensley/curtis/drawtext-measure-height

cwensley · web-flow · commit 6be8ecb2fda7 · 2025-02-22T08:44:26.000-08:00
diff --git a/test/Eto.Test/Sections/Drawing/DrawTextSection.cs b/test/Eto.Test/Sections/Drawing/DrawTextSection.cs
@@ -19,7 +19,9 @@ public DrawTextSection()
 
 		Control Default()
 		{
-			var control = new Drawable { Size = new Size(400, 500), BackgroundColor = Colors.Black };
+			var control = new Drawable { Width = 400, BackgroundColor = Colors.Black };
+			var height = GetDrawInfo().Sum(r => r.Font.MeasureString(r.Text).Height);
+			control.Height = (int)height;
 			control.Paint += (sender, e) => DrawFrame(e.Graphics);
 			return control;
 		}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ public DrawTextSection()`
`19`	`19`
`20`	`20`	`Control Default()`
`21`	`21`	`{`
`22`		`- var control = new Drawable { Size = new Size(400, 500), BackgroundColor = Colors.Black };`
	`22`	`+ var control = new Drawable { Width = 400, BackgroundColor = Colors.Black };`
	`23`	`+ var height = GetDrawInfo().Sum(r => r.Font.MeasureString(r.Text).Height);`
	`24`	`+ control.Height = (int)height;`
`23`	`25`	`control.Paint += (sender, e) => DrawFrame(e.Graphics);`
`24`	`26`	`return control;`
`25`	`27`	`}`