Skip to content

Fix icons of PropertyGrid control are not scaled well on 100% secondary monitor #14828

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

Open
ricardobossan wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −4
Open

Fix icons of PropertyGrid control are not scaled well on 100% secondary monitor #14828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97d865e
Fix icons of PropertyGrid control are not scaled well on 100% seconda…
Jul 30, 2026
99909b3
Handles feedback
Aug 4, 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
18 changes: 14 additions & 4 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,12 +1753,19 @@ private PropertyGridToolStripButton CreatePushButton(
EventHandler eventHandler,
bool useRadioButtonRole = false)
{
// ToolStripItem/ToolStripButton bake Margin and the minimum button width from
// ScaleHelper.InitialSystemDpi (the process's startup DPI) at construction time. Re-apply both
// explicitly so a button (re)created after a runtime DPI change reflects the grid's actual current
// DPI; DeviceDpi routes through ToolStripButton's own existing, correct DeviceDpi setter override.
// See https://github.com/dotnet/winforms/issues/8268.
PropertyGridToolStripButton button = new(this, useRadioButtonRole)
{
Text = toolTipText,
AutoToolTip = true,
DisplayStyle = ToolStripItemDisplayStyle.Image,
ImageIndex = imageIndex
ImageIndex = imageIndex,
Margin = ScaleHelper.ScaleToDpi(new Padding(0, 1, 0, 2), DeviceDpi),
DeviceDpi = DeviceDpi
};

button.Click += eventHandler;
Expand Down Expand Up @@ -2106,7 +2113,7 @@ private void EnsureLargeButtons()
ImageSize = s_largeButtonSize
};

if (ScaleHelper.IsScalingRequired)
if (ScaleHelper.IsScalingRequirementMet)
{
AddLargeImage(_alphaBitmap);
AddLargeImage(_categoryBitmap);
Expand Down Expand Up @@ -2140,7 +2147,7 @@ private void EnsureLargeButtons()
}
}

// This method should be called only inside a if (DpiHelper.IsScalingRequired) clause.
// This method should be called only inside a if (ScaleHelper.IsScalingRequirementMet) clause.
private void AddLargeImage(Bitmap? originalBitmap)
{
if (originalBitmap is null)
Expand Down Expand Up @@ -3874,7 +3881,7 @@ private void SetupToolbar(bool fullRebuild)
{
_normalButtonImages?.Dispose();
_normalButtonImages = new ImageList();
if (ScaleHelper.IsScalingRequired)
if (ScaleHelper.IsScalingRequirementMet)
{
_normalButtonImages.ImageSize = s_normalButtonSize;
}
Expand Down Expand Up @@ -4013,6 +4020,9 @@ private void SetupToolbar(bool fullRebuild)

_toolStrip.ImageList = LargeButtons ? _largeButtonImages : _normalButtonImages;

// Covers LargeButtons only (_largeButtonImages isn't ready earlier); a no-op otherwise.
_toolStrip.ImageScalingSize = _toolStrip.ImageList!.ImageSize;

using (SuspendLayoutScope scope = new(_toolStrip))
{
_toolStrip.Items.Clear();
Expand Down