Skip to content

Defining a FontSize in a FontIcon should not be overridden by its VisualParent's #1244

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
pomianowski merged 2 commits into from
Feb 1, 2025
Merged

Defining a FontSize in a FontIcon should not be overridden by its VisualParent's #1244

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b7609
Defining a FontSize in a FontIcon should not be overridden by its Vis…
Difegue Oct 1, 2024
4140b44
Only apply the VisualParent override if its size isn't the default we…
Difegue Oct 1, 2024
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
11 changes: 6 additions & 5 deletions src/Wpf.Ui/Controls/IconElement/FontIcon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,15 @@ public string Glyph

protected override UIElement InitializeChildren()
{
if (VisualParent is not null)
{
SetCurrentValue(FontSizeProperty, TextElement.GetFontSize(VisualParent));
}

if (FontSize.Equals(SystemFonts.MessageFontSize))
{
SetResourceReference(FontSizeProperty, "DefaultIconFontSize");

// If the FontSize is the default, set it to the parent's FontSize.
if (VisualParent is not null && TextElement.GetFontSize(VisualParent) != SystemFonts.MessageFontSize)
{
SetCurrentValue(FontSizeProperty, TextElement.GetFontSize(VisualParent));
}
}

TextBlock = new TextBlock
Expand Down