Skip to content

Replace deprecated WPF overloads #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eXpl0it3r merged 1 commit into from
Dec 12, 2025
Merged

Replace deprecated WPF overloads #229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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();
Expand All @@ -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));
}
Expand Down