Skip to content

Fix nested container controls scaling that have AutoscaleMode as Inherit #6130

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
merged 2 commits into from
Nov 10, 2021
Merged

Fix nested container controls scaling that have AutoscaleMode as Inherit #6130

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ea3af4
Fix nested container controls scaling that have AutoscaleMode as Inhe…
dreddy-work Nov 5, 2021
6d1740f
Review feedback.
dreddy-work Nov 5, 2021
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
7 changes: 6 additions & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/ContainerControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,12 @@ internal void FocusActiveControlInternal()
private SizeF GetParentAutoScaleFactor()
{
Control parentControl = Parent;
while (parentControl is not null and not ContainerControl)

// Traverse through parent hierarchy until we get a ContainerControl whose AutoScaleMode is not Inherit.
// AutoscaleFactor from this parent is used to scale the child controls within its hierarchy.
while (parentControl is not null
&& (parentControl is not ContainerControl containerControl
Copy link
Contributor

@Tanya-Solyanik Tanya-Solyanik Nov 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have other places with similar code walking the parent chain, don't we? Do we always skip non-container controls?

Copy link
Member Author

@dreddy-work dreddy-work Nov 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AutoscaleFactor is property on ContainerControl . So, we have to traverse parent chain until we get the right scale factor for its children. Also, ContainerControl gets OnFonChanged events to scale the children. Non-Container controls that receive OnFontChanged does not scale control but just set the Font.

|| containerControl.AutoScaleMode == AutoScaleMode.Inherit))
{
parentControl = parentControl.Parent;
}
Expand Down