Skip to content

Fix editable control border color in NET11 visual styles #14853

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 3 commits into
base: main
Choose a base branch
from
+11 −12
Open

Fix editable control border color in NET11 visual styles #14853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7e0624
Fix editable control border color in NET11 visual styles- #14853
LeafShi1 Aug 6, 2026
b630245
Update test cases
LeafShi1 Aug 6, 2026
97986b4
To ensure sufficient contrast between the border and the background, …
LeafShi1 Aug 6, 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
2 changes: 1 addition & 1 deletion ...ystem.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.ModernComboAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ private static Color GetBorderColor(ComboBox comboBox, bool useAccent)

return useAccent
? Application.SystemVisualSettings.AccentColor
: comboBox.ForeColor;
: ModernControlColorMath.TextControlBorderColor;
}

private static int GetBorderThickness(ComboBox comboBox)
Expand Down
3 changes: 1 addition & 2 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/TextBox/TextBoxBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2663,10 +2663,9 @@ private protected virtual void OnNcPaint(Graphics graphics, HDC windowHdc)
int borderThickness = Math.Max(focusBorderMetrics.Width, focusBorderMetrics.Height);
int focusBandHeight = GetVisualStylesFocusBandHeight();

Color adornerColor = ForeColor;

Color clientBackColor = BackColor;
Color parentBackColor = Parent?.BackColor ?? BackColor;
Color adornerColor = ModernControlColorMath.TextControlBorderColor;

using var clientBackgroundBrush = clientBackColor.GetCachedSolidBrushScope();
using var adornerBrush = adornerColor.GetCachedSolidBrushScope();
Expand Down
3 changes: 1 addition & 2 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,10 +1084,9 @@ private void DrawModernBorder(PaintEventArgs e)
int cornerRadius = LogicalToDeviceUnits(ModernControlVisualStyles.UpDownCornerRadius);
int borderThickness = LogicalToDeviceUnits(ModernControlVisualStyles.BorderThickness);

// The adorner (border) color matches the modern TextBox chrome, which uses the fore color.
Color adornerColor = ForeColor;
Color parentBackColor = Parent?.BackColor ?? BackColor;
Color clientBackColor = BackColor;
Color adornerColor = ModernControlColorMath.TextControlBorderColor;

@ricardobossan ricardobossan Aug 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR makes the same one-line change in three places, swapping the color source to ModernControlColorMath.TextControlBorderColor. In ComboBox.ModernComboAdapter.GetBorderColor (ComboBox.ModernComboAdapter.cs:412), that line sits inside a pre-existing if (!comboBox.Enabled) return ModernControlColorMath.GetDisabledBorderColor(); branch (not added by this PR, it was already there), so ComboBox picks up disabled-state handling for free:

private static Color GetBorderColor(ComboBox comboBox, bool useAccent)
{
    if (!comboBox.Enabled)
    {
        return ModernControlColorMath.GetDisabledBorderColor();
    }

    return useAccent
        ? Application.SystemVisualSettings.AccentColor
        : ModernControlColorMath.TextControlBorderColor;
}

TextBoxBase.cs:2668 and UpDownBase.cs:1089 never had an equivalent branch, so the same edit there just sets adornerColor unconditionally, with no Enabled check before or after. Since this PR is already touching the same color logic in all three places, is it worth adding the same disabled branch to TextBoxBase/UpDownBase here too, so they don't diverge from ComboBox?


using var clientBackgroundBrush = clientBackColor.GetCachedSolidBrushScope();
using var adornerPen = adornerColor.GetCachedPenScope(borderThickness);
Expand Down
5 changes: 5 additions & 0 deletions src/System.Windows.Forms/System/Windows/Forms/Rendering/ModernControlColorMath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ internal static class ModernControlColorMath
private static readonly Color s_darkModeDisabledForeground = Color.FromArgb(0x88, 0x88, 0x88);
private static readonly Color s_lightModeDisabledForeground = Color.FromArgb(0xA0, 0xA0, 0xA0);

internal static Color TextControlBorderColor
=> Application.IsDarkModeEnabled
? SystemColors.WindowText
: SystemColors.WindowFrame;

Comment on lines +30 to +34

@ricardobossan ricardobossan Aug 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider adding an XML doc like its siblings in this file?

/// <summary>
/// Gets the surface color for a disabled modern control, honoring the current color mode
/// and high contrast settings.
Expand Down
10 changes: 3 additions & 7 deletions src/test/unit/System.Windows.Forms/System/Windows/Forms/ComboBoxTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ public void ComboBox_ModernVisualStyles_FramesUseExpectedGeometryAndColor(

Color expectedBorder = usesAccent
? Application.SystemVisualSettings.AccentColor
: control.ForeColor;
: ModernControlColorMath.TextControlBorderColor;
Assert.True(
CountPixels(
actual,
Expand Down Expand Up @@ -642,13 +642,9 @@ public void ComboBox_ModernVisualStyles_Disabled_UsesDisabledBorderAndButtonColo

if (flatStyle != FlatStyle.Popup)
{
// Standard and Flat use the ForeColor for the border; it must be absent when disabled.
Assert.True(
CountPixels(enabledBitmap, customForeColor, channelTolerance: 16) > 0,
"Enabled ComboBox should render border with ForeColor.");
Assert.True(
CountPixels(disabledBitmap, customForeColor, channelTolerance: 16) == 0,
"Disabled ComboBox must not render border with the ForeColor.");
CountPixels(enabledBitmap, ModernControlColorMath.TextControlBorderColor, channelTolerance: 16) > 0,
"Enabled ComboBox should render border with TextControlBorderColor.");
Assert.True(
CountPixels(
disabledBitmap,
Expand Down