From 5df247795d331904a758e94b5edc611a509059da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Fri, 12 Dec 2025 17:53:56 +0100 Subject: [PATCH] Replace deprecated WPF overloads --- Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs b/Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs index 49649c320..b6685511d 100644 --- a/Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs +++ b/Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs @@ -122,7 +122,7 @@ public override RSize MeasureString(string str, RFont font) if (width <= 0) { - var formattedText = new FormattedText(str, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, ((FontAdapter)font).Font, 96d / 72d * font.Size, Brushes.Red); + var formattedText = new FormattedText(str, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, ((FontAdapter)font).Font, 96d / 72d * font.Size, Brushes.Red, 1.0); return new RSize(formattedText.WidthIncludingTrailingWhitespace, formattedText.Height); } @@ -164,7 +164,7 @@ public override void MeasureString(string str, RFont font, double maxWidth, out if (!handled) { - var formattedText = new FormattedText(str, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, ((FontAdapter)font).Font, 96d / 72d * font.Size, Brushes.Red); + var formattedText = new FormattedText(str, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, ((FontAdapter)font).Font, 96d / 72d * font.Size, Brushes.Red, 1.0); charFit = str.Length; charFitWidth = formattedText.WidthIncludingTrailingWhitespace; } @@ -202,7 +202,7 @@ public override void DrawString(string str, RFont font, RColor color, RPoint poi glyphRendered = true; var wpfPoint = Utils.ConvertRound(point); var glyphRun = new GlyphRun(glyphTypeface, rtl ? 1 : 0, - false, 96d / 72d * font.Size, glyphs, + false, 96d / 72d * font.Size, 1.0f, glyphs, wpfPoint, widths, null, null, null, null, null, null); var guidelines = new GuidelineSet(); @@ -216,7 +216,7 @@ public override void DrawString(string str, RFont font, RColor color, RPoint poi if (!glyphRendered) { - var formattedText = new FormattedText(str, CultureInfo.CurrentCulture, rtl ? FlowDirection.RightToLeft : FlowDirection.LeftToRight, ((FontAdapter)font).Font, 96d / 72d * font.Size, colorConv); + var formattedText = new FormattedText(str, CultureInfo.CurrentCulture, rtl ? FlowDirection.RightToLeft : FlowDirection.LeftToRight, ((FontAdapter)font).Font, 96d / 72d * font.Size, colorConv, 1.0); point.X += rtl ? formattedText.Width : 0; _g.DrawText(formattedText, Utils.ConvertRound(point)); }