Skip to content

Commit 699b011

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/winforms (#1516)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 501a1e9 commit 699b011

File tree

6 files changed

+114
-108
lines changed

6 files changed

+114
-108
lines changed

‎src/source-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@
139139
"commitSha": "7890fbb7f086ae12b11ca85499b18f460c9090dd"
140140
},
141141
{
142-
"barId": 275281,
142+
"barId": 275490,
143143
"path": "winforms",
144144
"remoteUri": "https://github.com/dotnet/winforms",
145-
"commitSha": "6dd129e422c9b14dc835e669688247386bef2f95"
145+
"commitSha": "c9252f63c0bfc3ad70278583bfd84963414acd04"
146146
},
147147
{
148148
"barId": 275380,

‎src/winforms/eng/Version.Details.xml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,106 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976" BarId="275143" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="78061f4bcc414fa2054be6237b1fd3813d8edf6b" BarId="275313" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25364.102">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25365.101">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
13+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25364.102">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25365.101">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
17+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25364.102">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25365.101">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
21+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25364.102">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25365.101">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
25+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25364.102">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25365.101">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
29+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25364.102">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25365.101">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
33+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25364.102">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25365.101">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
37+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25364.102">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25365.101">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
41+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.7.25364.102">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.7.25365.101">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
45+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25364.102">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25365.101">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
49+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25364.102">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25365.101">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
53+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25364.102">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25365.101">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
57+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25364.102">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25365.101">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
61+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.7.25364.102">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.7.25365.101">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
65+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25364.102">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25365.101">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
69+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25364.102">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25365.101">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
73+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25364.102">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25365.101">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
77+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.7.25364.102">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.7.25365.101">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
81+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25364.102">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25365.101">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
88+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25364.102">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25365.101">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
92+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25364.102">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25365.101">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
96+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25364.102">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25365.101">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
100+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25364.102">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25365.101">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
104+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25364.102">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25365.101">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976</Sha>
108+
<Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎src/winforms/eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1111
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1212
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
13-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25364.102</SystemReflectionMetadataLoadContextVersion>
14-
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25364.102</SystemTextEncodingsWebVersion>
13+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25365.101</SystemReflectionMetadataLoadContextVersion>
14+
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25365.101</SystemTextEncodingsWebVersion>
1515
</PropertyGroup>
1616
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1717
<PropertyGroup>
18-
<SystemFormatsNrbfPackageVersion>10.0.0-preview.7.25364.102</SystemFormatsNrbfPackageVersion>
19-
<SystemIOHashingPackageVersion>10.0.0-preview.7.25364.102</SystemIOHashingPackageVersion>
18+
<SystemFormatsNrbfPackageVersion>10.0.0-preview.7.25365.101</SystemFormatsNrbfPackageVersion>
19+
<SystemIOHashingPackageVersion>10.0.0-preview.7.25365.101</SystemIOHashingPackageVersion>
2020
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
21-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.7.25364.102</MicrosoftNETCoreILDAsmPackageVersion>
21+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.7.25365.101</MicrosoftNETCoreILDAsmPackageVersion>
2222
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
23-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.7.25364.102</SystemRuntimeSerializationFormattersPackageVersion>
24-
<SystemTextJsonPackageVersion>10.0.0-preview.7.25364.102</SystemTextJsonPackageVersion>
25-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.7.25364.102</MicrosoftNETCoreAppRefPackageVersion>
26-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.7.25364.102</MicrosoftNETCorePlatformsPackageVersion>
27-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.7.25364.102</MicrosoftWin32SystemEventsPackageVersion>
28-
<SystemCodeDomPackageVersion>10.0.0-preview.7.25364.102</SystemCodeDomPackageVersion>
29-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25364.102</SystemConfigurationConfigurationManagerPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.7.25364.102</SystemResourcesExtensionsPackageVersion>
23+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.7.25365.101</SystemRuntimeSerializationFormattersPackageVersion>
24+
<SystemTextJsonPackageVersion>10.0.0-preview.7.25365.101</SystemTextJsonPackageVersion>
25+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.7.25365.101</MicrosoftNETCoreAppRefPackageVersion>
26+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.7.25365.101</MicrosoftNETCorePlatformsPackageVersion>
27+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.7.25365.101</MicrosoftWin32SystemEventsPackageVersion>
28+
<SystemCodeDomPackageVersion>10.0.0-preview.7.25365.101</SystemCodeDomPackageVersion>
29+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.7.25365.101</SystemConfigurationConfigurationManagerPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.7.25365.101</SystemResourcesExtensionsPackageVersion>
3131
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
32-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.7.25364.102</SystemWindowsExtensionsPackageVersion>
33-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25364.102</MicrosoftNETCoreILAsmPackageVersion>
34-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25364.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25364.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36-
<MicrosoftNETSdkILVersion>10.0.0-preview.7.25364.102</MicrosoftNETSdkILVersion>
32+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.7.25365.101</SystemWindowsExtensionsPackageVersion>
33+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25365.101</MicrosoftNETCoreILAsmPackageVersion>
34+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25365.101</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
35+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.7.25365.101</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
36+
<MicrosoftNETSdkILVersion>10.0.0-preview.7.25365.101</MicrosoftNETSdkILVersion>
3737
<!--
3838
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
3939
-->
@@ -46,9 +46,9 @@
4646
</PropertyGroup>
4747
<!-- Arcade -->
4848
<PropertyGroup>
49-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25364.102</MicrosoftDotNetGenFacadesPackageVersion>
50-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25364.102</MicrosoftDotNetRemoteExecutorVersion>
51-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25364.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
49+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25365.101</MicrosoftDotNetGenFacadesPackageVersion>
50+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25365.101</MicrosoftDotNetRemoteExecutorVersion>
51+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25365.101</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
5252
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5353
</PropertyGroup>
5454
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎src/winforms/global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25364.102",
25-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25364.102",
26-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25364.102",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25365.101",
25+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25365.101",
26+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25365.101",
2727
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
28-
"Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25364.102"
28+
"Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25365.101"
2929
},
3030
"native-tools": {
3131
"cmake": "latest"

‎src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -44,39 +44,37 @@ public void RenderButton(
4444
ArgumentNullException.ThrowIfNull(paintImage);
4545
ArgumentNullException.ThrowIfNull(paintField);
4646

47-
// Clear the background over the whole button area.
48-
ClearBackground(graphics, parentBackgroundColor);
49-
50-
// Use padding from ButtonDarkModeRenderer
51-
Padding padding = PaddingCore;
52-
53-
Rectangle paddedBounds = new(
54-
x: bounds.X + padding.Left,
55-
y: bounds.Y + padding.Top,
56-
width: bounds.Width - padding.Horizontal,
57-
height: bounds.Height - padding.Vertical);
58-
59-
// Draw button background and get content bounds
60-
Rectangle contentBounds = DrawButtonBackground(graphics, paddedBounds, state, isDefault);
61-
62-
// Offset content bounds for Popup style when button is pressed
63-
// if (flatStyle == FlatStyle.Popup && state == PushButtonState.Pressed)
64-
// {
65-
// contentBounds.Offset(1, 1);
66-
// }
67-
68-
// Paint image and field using the provided delegates
69-
paintImage(contentBounds);
70-
71-
paintField(
72-
contentBounds,
73-
GetTextColor(state, isDefault),
74-
false);
75-
76-
if (focused && showFocusCues)
47+
// Scope the graphics state so all changes are reverted after rendering
48+
using (new GraphicsStateScope(graphics))
7749
{
78-
// Draw focus indicator for other styles
79-
DrawFocusIndicator(graphics, bounds, isDefault);
50+
// Clear the background over the whole button area.
51+
ClearBackground(graphics, parentBackgroundColor);
52+
53+
// Use padding from ButtonDarkModeRenderer
54+
Padding padding = PaddingCore;
55+
56+
Rectangle paddedBounds = new(
57+
x: bounds.X + padding.Left,
58+
y: bounds.Y + padding.Top,
59+
width: bounds.Width - padding.Horizontal,
60+
height: bounds.Height - padding.Vertical);
61+
62+
// Draw button background and get content bounds
63+
Rectangle contentBounds = DrawButtonBackground(graphics, paddedBounds, state, isDefault);
64+
65+
// Paint image and field using the provided delegates
66+
paintImage(contentBounds);
67+
68+
paintField(
69+
contentBounds,
70+
GetTextColor(state, isDefault),
71+
false);
72+
73+
if (focused && showFocusCues)
74+
{
75+
// Draw focus indicator for other styles
76+
DrawFocusIndicator(graphics, bounds, isDefault);
77+
}
8078
}
8179
}
8280

‎src/winforms/src/System.Windows.Forms/System/Windows/Forms/Form.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,6 +1790,9 @@ private void ResetFormScreenCaptureMode() =>
17901790

17911791
private void SetScreenCaptureModeInternal(ScreenCaptureMode value)
17921792
{
1793+
// Always reset to NONE before setting new affinity.
1794+
PInvoke.SetWindowDisplayAffinity(HWND, WINDOW_DISPLAY_AFFINITY.WDA_NONE);
1795+
17931796
WINDOW_DISPLAY_AFFINITY affinity = value switch
17941797
{
17951798
ScreenCaptureMode.Allow => WINDOW_DISPLAY_AFFINITY.WDA_NONE,
@@ -4228,6 +4231,11 @@ protected override void OnHandleCreated(EventArgs e)
42284231
{
42294232
SetFormTitleProperties();
42304233
}
4234+
4235+
if (FormScreenCaptureMode != ScreenCaptureMode.Allow)
4236+
{
4237+
SetScreenCaptureModeInternal(FormScreenCaptureMode);
4238+
}
42314239
}
42324240

42334241
/// <summary>

0 commit comments

Comments
 (0)