Imported Upstream version 5.16.0.122

Former-commit-id: 60dd6d91c5dc30a6569681c1b8d7cddebae4e52b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-28 08:15:10 +00:00
parent f8f43c9aed
commit 73002b0b4a
177 changed files with 232 additions and 77 deletions

View File

@ -195,8 +195,13 @@ namespace System.Windows.Forms.Layout
{
IArrangedContainer parent = (IArrangedContainer)container;
LayoutDockedChildren (parent, parent.Controls);
LayoutAnchoredChildren (parent, parent.Controls);
if (parent.Controls is Control.ControlCollection controlCollection) {
LayoutDockedChildren (parent, controlCollection.GetAllControls());
LayoutAnchoredChildren (parent, controlCollection.GetAllControls());
} else {
LayoutDockedChildren (parent, parent.Controls);
LayoutAnchoredChildren (parent, parent.Controls);
}
return parent.AutoSize;
}