From 342a4922b3ed0fddfa200ffbeac2ce7a3ecb27f4 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Wed, 24 Jun 2026 09:59:01 +0800 Subject: [PATCH 1/2] Fix issue 14667: [HDPI] The icon of Property Page button changed after switched the LargeButtons property value from False to True --- .../Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs index 9f19a33d013..16ec068fffc 100644 --- a/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs +++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs @@ -2066,12 +2066,12 @@ private void EnsureLargeButtons() AddLargeImage(_alphaBitmap); AddLargeImage(_categoryBitmap); + AddLargeImage(_propertyPageBitmap); + foreach (var tab in _tabs) { AddLargeImage(tab.Tab.Bitmap); } - - AddLargeImage(_propertyPageBitmap); } else { From 1dd960d516093f03bb1a83a9fe21c3195621d3d2 Mon Sep 17 00:00:00 2001 From: "Simon Zhao (BEYONDSOFT CONSULTING INC)" Date: Wed, 24 Jun 2026 16:31:15 +0800 Subject: [PATCH 2/2] Handle feedback --- .../Forms/Controls/PropertyGrid/PropertyGrid.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs index 16ec068fffc..f3996780fa1 100644 --- a/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs +++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGrid.cs @@ -2066,12 +2066,15 @@ private void EnsureLargeButtons() AddLargeImage(_alphaBitmap); AddLargeImage(_categoryBitmap); - AddLargeImage(_propertyPageBitmap); - - foreach (var tab in _tabs) + if (_tabs.Count > 1) { - AddLargeImage(tab.Tab.Bitmap); + foreach (var tab in _tabs) + { + AddLargeImage(tab.Tab.Bitmap); + } } + + AddLargeImage(_propertyPageBitmap); } else {