Skip to content

Fix CheckBox/RadioButton Appearance.Button + FlatStyle.Standard invisible in dark mode #14397

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 1 commit into
base: main
Choose a base branch
from
+7 −28
Open

Fix CheckBox/RadioButton Appearance.Button + FlatStyle.Standard invisible in dark mode #14397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...ows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ internal override Size GetPreferredSizeCore(Size proposedSize)
{
if (Control.Appearance == Appearance.Button)
{
ButtonStandardAdapter adapter = new(Control);
ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreateStandardAdapter(Control);
return adapter.GetPreferredSizeCore(proposedSize);
}
else
Expand All @@ -105,9 +105,9 @@ internal override Size GetPreferredSizeCore(Size proposedSize)
}
}

private new ButtonStandardAdapter ButtonAdapter => (ButtonStandardAdapter)base.ButtonAdapter;
private new ButtonBaseAdapter ButtonAdapter => base.ButtonAdapter;

protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonStandardAdapter(Control);
protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateStandardAdapter(Control);

Comment on lines 109 to 111
protected override LayoutOptions Layout(PaintEventArgs e)
{
Expand Down
4 changes: 2 additions & 2 deletions ....Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
}
}

private new ButtonStandardAdapter ButtonAdapter => (ButtonStandardAdapter)base.ButtonAdapter;
private new ButtonBaseAdapter ButtonAdapter => base.ButtonAdapter;

protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonStandardAdapter(Control);
protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateStandardAdapter(Control);

Comment on lines +53 to 56
protected override LayoutOptions Layout(PaintEventArgs e)
{
Expand Down
12 changes: 1 addition & 11 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 @@ -96,17 +96,7 @@ public Appearance Appearance
}
}

private protected override bool OwnerDraw =>
// We want NO owner draw ONLY when we're
// * In Dark Mode
// * When _then_ the Appearance is Button
// * But then ONLY when we're rendering with FlatStyle.Standard
// (because that would let us usually let us draw with the VisualStyleRenderers,
// which cause HighDPI issues in Dark Mode).
(!Application.IsDarkModeEnabled
|| Appearance != Appearance.Button
|| FlatStyle != FlatStyle.Standard)
&& base.OwnerDraw;
private protected override bool OwnerDraw => base.OwnerDraw;

[SRCategory(nameof(SR.CatPropertyChanged))]
[SRDescription(nameof(SR.CheckBoxOnAppearanceChangedDescr))]
Expand Down
13 changes: 1 addition & 12 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 @@ -173,18 +173,7 @@ public bool Checked
}
}

private protected override bool OwnerDraw =>
// Order is key here - do NOT change!
// We want NO owner draw ONLY when we're
// * in Dark Mode
// * when _then_ the Appearance is Button
// * but then ONLY when we're rendering with FlatStyle.Standard
// (because that would let us usually let us draw with the VisualStyleRenderers,
// which cause HighDPI issues in Dark Mode).
(!Application.IsDarkModeEnabled
|| Appearance != Appearance.Button
|| FlatStyle != FlatStyle.Standard)
&& base.OwnerDraw;
private protected override bool OwnerDraw => base.OwnerDraw;

Comment on lines +176 to 177
/// <hideinheritance/>
[Browsable(false)]
Expand Down
Loading