Skip to content

[release/10.0] Fix 13829 Dark Mode: Button ForeColor ignored in Dark Mode when FlatStyle is Flat/Popup and Form.ForeColor Is set #13864

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

Closed
wants to merge 1 commit into from
Closed

[release/10.0] Fix 13829 Dark Mode: Button ForeColor ignored in Dark Mode when FlatStyle is Flat/Popup and Form.ForeColor Is set #13864

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
2 changes: 0 additions & 2 deletions src/System.Windows.Forms/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
override System.Windows.Forms.ButtonBase.OnBackColorChanged(System.EventArgs! e) -> void
override System.Windows.Forms.ButtonBase.OnForeColorChanged(System.EventArgs! e) -> void
static System.Windows.Forms.Application.SetColorMode(System.Windows.Forms.SystemColorMode systemColorMode) -> void
static System.Windows.Forms.TaskDialog.ShowDialogAsync(nint hwndOwner, System.Windows.Forms.TaskDialogPage! page, System.Windows.Forms.TaskDialogStartupLocation startupLocation = System.Windows.Forms.TaskDialogStartupLocation.CenterOwner) -> System.Threading.Tasks.Task<System.Windows.Forms.TaskDialogButton!>!
static System.Windows.Forms.TaskDialog.ShowDialogAsync(System.Windows.Forms.IWin32Window! owner, System.Windows.Forms.TaskDialogPage! page, System.Windows.Forms.TaskDialogStartupLocation startupLocation = System.Windows.Forms.TaskDialogStartupLocation.CenterOwner) -> System.Threading.Tasks.Task<System.Windows.Forms.TaskDialogButton!>!
Expand Down
24 changes: 0 additions & 24 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,30 +1202,6 @@ protected override void OnKeyDown(KeyEventArgs kevent)
base.OnKeyDown(kevent);
}

// These two properties are mainly used for ButtonDarkModeAdapter.
internal bool BackColorSet { get; set; }
internal bool ForeColorSet { get; set; }

protected override void OnForeColorChanged(EventArgs e)
{
base.OnForeColorChanged(e);
if (Application.IsDarkModeEnabled)
{
ForeColorSet = ShouldSerializeForeColor();
UpdateOwnerDraw();
}
}

protected override void OnBackColorChanged(EventArgs e)
{
base.OnBackColorChanged(e);
if (Application.IsDarkModeEnabled)
{
BackColorSet = ShouldSerializeBackColor();
UpdateOwnerDraw();
}
}

/// <summary>
/// Raises the <see cref="OnKeyUp"/> event.
/// </summary>
Expand Down
14 changes: 7 additions & 7 deletions ...ms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private Color GetButtonTextColor(IDeviceContext deviceContext, PushButtonState s
{
Color textColor;

if (Control.ForeColorSet)
if (Control.ForeColor != Forms.Control.DefaultForeColor)
{
textColor = new ColorOptions(deviceContext, Control.ForeColor, Control.BackColor)
{
Expand All @@ -51,23 +51,23 @@ private Color GetButtonTextColor(IDeviceContext deviceContext, PushButtonState s

private Color GetButtonBackColor(PushButtonState state)
{
Color textColor;
Color backColor;

if (Control.BackColorSet)
if (Control.BackColor != Forms.Control.DefaultBackColor)
{
textColor = Control.BackColor;
backColor = Control.BackColor;

if (IsHighContrastHighlighted())
{
textColor = SystemColors.HighlightText;
backColor = SystemColors.HighlightText;
}
}
else
{
textColor = ButtonDarkModeRenderer.GetBackgroundColor(state, Control.IsDefault);
backColor = ButtonDarkModeRenderer.GetBackgroundColor(state, Control.IsDefault);
}

return textColor;
return backColor;
}

internal override void PaintUp(PaintEventArgs e, CheckState state)
Expand Down