Skip to content

[release/10.0] Fix CheckBox/RadioButton Appearance switching in Dark Mode #14209

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
github-actions wants to merge 2 commits into
base: release/10.0
Choose a base branch
from
+12 −8
Open

[release/10.0] Fix CheckBox/RadioButton Appearance switching in Dark Mode #14209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc45a2
Fix CheckBox/RadioButton Appearance switching in Dark Mode
LeafShi1 Jan 8, 2026
70bc8e8
Update src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons…
LeafShi1 Jan 8, 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
12 changes: 7 additions & 5 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,20 @@ public Appearance Appearance
using (LayoutTransaction.CreateTransactionIf(AutoSize, ParentInternal, this, PropertyNames.Appearance))
{
_appearance = value;

// UpdateOwnerDraw synchronizes control styles with the OwnerDraw state and recreates
// the handle if they differ. Since we hijack FlatStyle.Standard for DarkMode, the transition
// between Normal and Button appearance is critical for updating the OwnerDraw flag.
UpdateOwnerDraw();

// If handle wasn't recreated (OwnerDraw state didn't change), refresh the appearance.
if (OwnerDraw)
{
Refresh();
}
else
{
UpdateStyles();

// UpdateStyles should also update the UserDraw flag, but it doesn't.
// Since we hijack FlatStyle.Standard for DarkMode and let that SystemRender,
// the threshold from Normal to Button is important to update the OwnerDraw flag.
UpdateOwnerDraw();
}

OnAppearanceChanged(EventArgs.Empty);
Expand Down
8 changes: 5 additions & 3 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/RadioButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,18 @@ public Appearance Appearance
using (LayoutTransaction.CreateTransactionIf(AutoSize, ParentInternal, this, PropertyNames.Appearance))
{
_appearance = value;

// UpdateOwnerDraw checks if OwnerDraw state changed and calls RecreateHandle if needed.
UpdateOwnerDraw();

// If handle wasn't recreated (OwnerDraw state didn't change), refresh the appearance.
if (OwnerDraw)
{
Refresh();
}
else
{
UpdateStyles();

// UpdateStyles should also update the UserDraw flag, but it doesn't.
UpdateOwnerDraw();
}

OnAppearanceChanged(EventArgs.Empty);
Expand Down