Skip to content

Improve ButtonDarkModeAdapter color handling and remove inappropriate HighContrast logic #14161

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
LeafShi1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve ButtonDarkModeAdapter color handling and remove inappropriate HighContrast logic #14161

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
14 changes: 2 additions & 12 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,17 +29,12 @@ private Color GetButtonTextColor(IDeviceContext deviceContext, PushButtonState s
{
Color textColor;

if (Control.ForeColor != Forms.Control.DefaultForeColor)
if (Control.ShouldSerializeForeColor())
{
textColor = new ColorOptions(deviceContext, Control.ForeColor, Control.BackColor)
{
Enabled = Control.Enabled
}.Calculate().WindowText;

if (IsHighContrastHighlighted())
{
textColor = SystemColors.HighlightText;
}
}
else
{
Expand All @@ -53,14 +48,9 @@ private Color GetButtonBackColor(PushButtonState state)
{
Color backColor;

if (Control.BackColor != Forms.Control.DefaultBackColor)
if (!Control.UseVisualStyleBackColor || Control.ShouldSerializeBackColor())
{
backColor = Control.BackColor;

if (IsHighContrastHighlighted())
{
backColor = SystemColors.HighlightText;
}
}
else
{
Expand Down