Skip to content

WI01100144 - Control's position is wrong in .net10 #37

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
3 commits merged into from
Jul 15, 2026
Merged

WI01100144 - Control's position is wrong in .net10 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f87264a
refer from https://github.com/WiseTechGlobal/CargoWise.Controls.WinFo…
jaywang-cn Jul 13, 2026
5fb47f6
update the PackageReleaseNotes
jaywang-cn Jul 13, 2026
7c324ac
update the comments
jaywang-cn Jul 13, 2026
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
2 changes: 1 addition & 1 deletion ...tem.Windows.Forms.Legacy/System.Windows.Forms.Package/System.Windows.Forms.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<WtgPackageVersionPrefix>0.1.0</WtgPackageVersionPrefix>
<PackageVersion Condition="'$(PackageVersion)' == ''">$(WtgPackageVersionPrefix)-dev</PackageVersion>
<PackageDescription>WiseTech Global forked version of System.Windows.Forms that includes controls that were deprecated in .NET Core 3.1 and .NET 5, like DataGrid, Menu, ToolBar and StatusBar.</PackageDescription>
<PackageReleaseNotes>Rollback custom binding context support in BindingContext/RelatedCurrencyManager, PR link: https://github.com/WiseTechGlobal/winforms/pull/20</PackageReleaseNotes>
<PackageReleaseNotes>Remove IsScalingRequirementMet from DefaultLayout.cs, PR link: https://github.com/WiseTechGlobal/winforms/pull/37</PackageReleaseNotes>
<Authors>WiseTech Global</Authors>
<Copyright>© WiseTech Global Limited. All rights reserved.</Copyright>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down
56 changes: 15 additions & 41 deletions src/System.Windows.Forms/System/Windows/Forms/Layout/DefaultLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,24 +762,12 @@ private static void UpdateAnchorInfo(IArrangedElement element)
AnchorStyles anchor = GetAnchor(element);
if (IsAnchored(anchor, AnchorStyles.Right))
{
if (ScaleHelper.IsScalingRequirementMet && (anchorInfo.Right - parentWidth > 0) && (oldAnchorInfo.Right < 0))
{
// Parent was resized to fit its parent, or screen, we need to reuse old anchors info to prevent losing control beyond right edge.
anchorInfo.Right = oldAnchorInfo.Right;
if (!IsAnchored(anchor, AnchorStyles.Left))
{
// Control might have been resized, update Left anchors.
anchorInfo.Left = oldAnchorInfo.Right - cachedBounds.Width;
}
}
else
{
anchorInfo.Right -= parentWidth;
// This differs from the official WinForms implementation because we encountered an issue with DPI handling. See WI01100144.
anchorInfo.Right -= parentWidth;

if (!IsAnchored(anchor, AnchorStyles.Left))
{
anchorInfo.Left -= parentWidth;
}
if (!IsAnchored(anchor, AnchorStyles.Left))
{
anchorInfo.Left -= parentWidth;
}
}
else if (!IsAnchored(anchor, AnchorStyles.Left))
Expand All @@ -790,26 +778,12 @@ private static void UpdateAnchorInfo(IArrangedElement element)

if (IsAnchored(anchor, AnchorStyles.Bottom))
{
if (ScaleHelper.IsScalingRequirementMet && (anchorInfo.Bottom - parentHeight > 0) && (oldAnchorInfo.Bottom < 0))
{
// The parent was resized to fit its parent or the screen, we need to reuse the old anchors info
// to prevent positioning the control beyond the bottom edge.
anchorInfo.Bottom = oldAnchorInfo.Bottom;
// This differs from the official WinForms implementation because we encountered an issue with DPI handling. See WI01100144.
anchorInfo.Bottom -= parentHeight;

if (!IsAnchored(anchor, AnchorStyles.Top))
{
// The control might have been resized, update the Top anchor.
anchorInfo.Top = oldAnchorInfo.Bottom - cachedBounds.Height;
}
}
else
if (!IsAnchored(anchor, AnchorStyles.Top))
{
anchorInfo.Bottom -= parentHeight;

if (!IsAnchored(anchor, AnchorStyles.Top))
{
anchorInfo.Top -= parentHeight;
}
anchorInfo.Top -= parentHeight;
}
}
else if (!IsAnchored(anchor, AnchorStyles.Top))
Expand Down Expand Up @@ -1048,19 +1022,19 @@ private static void ApplyCachedBounds(IArrangedElement container)
while (dictionary.Count > 0)
{
#endif
foreach (DictionaryEntry entry in dictionary)
{
IArrangedElement element = (IArrangedElement)entry.Key;
foreach (DictionaryEntry entry in dictionary)
{
IArrangedElement element = (IArrangedElement)entry.Key;

Debug.Assert(element.Container == container, "We have non-children in our containers cached bounds store.");
Debug.Assert(element.Container == container, "We have non-children in our containers cached bounds store.");
#if DEBUG
// We are about to set the bounds to the cached value. We clear the cached value
// before SetBounds because some controls fiddle with the bounds on SetBounds
// and will callback InitLayout with a different bounds and BoundsSpecified.
dictionary.Remove(entry.Key);
#endif
Rectangle bounds = (Rectangle)entry.Value!;
element.SetBounds(bounds, BoundsSpecified.None);
Rectangle bounds = (Rectangle)entry.Value!;
element.SetBounds(bounds, BoundsSpecified.None);
#if DEBUG
break;
}
Expand Down
Loading