fix #13813 : Dark Mode: The ForeColor & BackColor properties are not working for the controls

Epica3055 · Epica3055 · commit 56934271fd8b · 2025-08-20T10:36:34.000+08:00
diff --git a/src/System.Windows.Forms/PublicAPI.Unshipped.txt b/src/System.Windows.Forms/PublicAPI.Unshipped.txt
@@ -1,3 +1,5 @@
+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!>!
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs
@@ -170,6 +170,8 @@ private protected override bool OwnerDraw
                 // ...the user wants to opt out of implicit DarkMode rendering.
                 && DarkModeRequestState is true
 
+                && !ForeColorSet
+                && !BackColorSet
                 // And all of this only counts for FlatStyle.Standard. For the
                 // rest, we're using specific renderers anyway, which check
                 // themselves on demand, if they need to apply Light- or DarkMode.
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonBase.cs
@@ -1202,6 +1202,23 @@ protected override void OnKeyDown(KeyEventArgs kevent)
         base.OnKeyDown(kevent);
     }
 
+    internal bool BackColorSet { get; set; }
+    internal bool ForeColorSet { get; set; }
+
+    protected override void OnForeColorChanged(EventArgs e)
+    {
+        base.OnForeColorChanged(e);
+        ForeColorSet = ShouldSerializeForeColor();
+        UpdateOwnerDraw();
+    }
+
+    protected override void OnBackColorChanged(EventArgs e)
+    {
+        base.OnBackColorChanged(e);
+        BackColorSet = ShouldSerializeBackColor();
+        UpdateOwnerDraw();
+    }
+
     /// <summary>
     ///  Raises the <see cref="OnKeyUp"/> event.
     /// </summary>
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
@@ -25,6 +25,51 @@ internal ButtonDarkModeAdapter(ButtonBase control) : base(control)
     private ButtonDarkModeRendererBase ButtonDarkModeRenderer =>
         _buttonDarkModeRenderer;
 
+    private Color GetButtonTextColor(IDeviceContext deviceContext, PushButtonState state)
+    {
+        Color textColor;
+
+        if (Control.ForeColorSet)
+        {
+            textColor = new ColorOptions(deviceContext, Control.ForeColor, Control.BackColor)
+            {
+                Enabled = Control.Enabled
+            }.Calculate().WindowText;
+
+            if (IsHighContrastHighlighted())
+            {
+                textColor = SystemColors.HighlightText;
+            }
+        }
+        else
+        {
+            textColor = ButtonDarkModeRenderer.GetTextColor(state, Control.IsDefault);
+        }
+
+        return textColor;
+    }
+
+    private Color GetButtonBackColor(PushButtonState state)
+    {
+        Color textColor;
+
+        if (Control.BackColorSet)
+        {
+            textColor = Control.BackColor;
+
+            if (IsHighContrastHighlighted())
+            {
+                textColor = SystemColors.HighlightText;
+            }
+        }
+        else
+        {
+            textColor = ButtonDarkModeRenderer.GetBackgroundColor(state, Control.IsDefault);
+        }
+
+        return textColor;
+    }
+
     internal override void PaintUp(PaintEventArgs e, CheckState state)
     {
         try
@@ -36,21 +81,23 @@ internal override void PaintUp(PaintEventArgs e, CheckState state)
 
             LayoutData layout = CommonLayout().Layout();
 
+            PushButtonState pushButtonState = ToPushButtonState(state, Control.Enabled);
             ButtonDarkModeRenderer.RenderButton(
                 g,
                 Control.ClientRectangle,
                 Control.FlatStyle,
-                ToPushButtonState(state, Control.Enabled),
+                pushButtonState,
                 Control.IsDefault,
                 Control.Focused,
                 Control.ShowFocusCues,
                 Control.Parent?.BackColor ?? Control.BackColor,
+                GetButtonBackColor(pushButtonState),
                 _ => PaintImage(e, layout),
-                (_, textColor, drawFocus) => PaintField(
+                (_, textColor1, drawFocus) => PaintField(
                     e,
                     layout,
                     PaintDarkModeRender(e).Calculate(),
-                    textColor,
+                    GetButtonTextColor(e, pushButtonState),
                     drawFocus: false)
             );
 
@@ -82,12 +129,13 @@ internal override void PaintDown(PaintEventArgs e, CheckState state)
                 Control.Focused,
                 Control.ShowFocusCues,
                 Control.Parent?.BackColor ?? Control.BackColor,
+                GetButtonBackColor(PushButtonState.Pressed),
                 _ => PaintImage(e, layout),
                 (_, textColor, drawFocus) => PaintField(
                     e,
                     layout,
                     PaintDarkModeRender(e).Calculate(),
-                    textColor,
+                    GetButtonTextColor(e, PushButtonState.Pressed),
                     drawFocus: false)
             );
 
@@ -119,12 +167,13 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
                 Control.Focused,
                 Control.ShowFocusCues,
                 Control.Parent?.BackColor ?? Control.BackColor,
+                GetButtonBackColor(PushButtonState.Hot),
                 _ => PaintImage(e, layout),
                 (_, textColor, drawFocus) => PaintField(
                     e,
                     layout,
                     PaintDarkModeRender(e).Calculate(),
-                    textColor,
+                    GetButtonTextColor(e, PushButtonState.Hot),
                     drawFocus: false)
             );
 
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
@@ -37,6 +37,7 @@ public void RenderButton(
         bool focused,
         bool showFocusCues,
         Color parentBackgroundColor,
+        Color backColor,
         Action<Rectangle> paintImage,
         Action<Rectangle, Color, bool> paintField)
     {
@@ -60,7 +61,7 @@ public void RenderButton(
                 height: bounds.Height - padding.Vertical);
 
             // Draw button background and get content bounds
-            Rectangle contentBounds = DrawButtonBackground(graphics, paddedBounds, state, isDefault);
+            Rectangle contentBounds = DrawButtonBackground(graphics, paddedBounds, state, isDefault, backColor);
 
             // Paint image and field using the provided delegates
             paintImage(contentBounds);
@@ -78,9 +79,11 @@ public void RenderButton(
         }
     }
 
-    public abstract Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault);
+    public abstract Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault, Color backColor);
 
     public abstract void DrawFocusIndicator(Graphics graphics, Rectangle contentBounds, bool isDefault);
 
     public abstract Color GetTextColor(PushButtonState state, bool isDefault);
+
+    public abstract Color GetBackgroundColor(PushButtonState state, bool isDefault);
 }
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/FlatButtonDarkModeRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/FlatButtonDarkModeRenderer.cs
@@ -23,10 +23,10 @@ internal sealed class FlatButtonDarkModeRenderer : ButtonDarkModeRendererBase
     private protected override Padding PaddingCore { get; } = new(0);
 
     public override Rectangle DrawButtonBackground(
-        Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault)
+        Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault, Color backColor)
     {
         // fill background
-        using var back = GetBackgroundColor(state, isDefault).GetCachedSolidBrushScope();
+        using var back = backColor.GetCachedSolidBrushScope();
         graphics.FillRectangle(back, bounds);
 
         // draw border identical to Win32
@@ -58,7 +58,7 @@ public override Color GetTextColor(PushButtonState state, bool isDefault) =>
                 ? DefaultColors.AcceptButtonTextColor
                 : DefaultColors.NormalTextColor;
 
-    private static Color GetBackgroundColor(PushButtonState state, bool isDefault) =>
+    public override Color GetBackgroundColor(PushButtonState state, bool isDefault) =>
         isDefault
             ? state switch
             {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/IButtonRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/IButtonRenderer.cs
@@ -48,6 +48,7 @@ void RenderButton(
         bool focused,
         bool showFocusCues,
         Color parentBackgroundColor,
+        Color backColor,
         Action<Rectangle> paintImage,
         Action<Rectangle, Color, bool> paintField);
 
@@ -59,7 +60,7 @@ void RenderButton(
     /// <param name="state">State of the button (normal, hot, pressed, disabled)</param>
     /// <param name="isDefault">True if button is the default button</param>
     /// <returns>The content bounds (area inside the button for text/image)</returns>
-    Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault);
+    Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault, Color backColor);
 
     /// <summary>
     ///  Draws focus indicator appropriate for this style.
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs
@@ -30,7 +30,7 @@ internal class PopupButtonDarkModeRenderer : ButtonDarkModeRendererBase
     /// <summary>
     ///  Draws button background with popup styling, including subtle 3D effect.
     /// </summary>
-    public override Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault)
+    public override Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault, Color backColor)
     {
         // Use padding from ButtonDarkModeRenderer
         Padding padding = PaddingCore;
@@ -45,9 +45,6 @@ public override Rectangle DrawButtonBackground(Graphics graphics, Rectangle boun
             contentBounds.Offset(ContentOffset, ContentOffset);
         }
 
-        // Get appropriate background color based on state
-        Color backColor = GetBackgroundColor(state, isDefault);
-
         // Create path for rounded corners
         using GraphicsPath path = CreateRoundedRectanglePath(paddedBounds, ButtonCornerRadius);
 
@@ -101,7 +98,7 @@ public override Color GetTextColor(PushButtonState state, bool isDefault) =>
     /// <summary>
     ///  Gets the background color appropriate for the button state and type.
     /// </summary>
-    private static Color GetBackgroundColor(PushButtonState state, bool isDefault) =>
+    public override Color GetBackgroundColor(PushButtonState state, bool isDefault) =>
         isDefault
             ? state switch
             {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/SystemButtonDarkModeRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/SystemButtonDarkModeRenderer.cs
@@ -30,16 +30,13 @@ internal class SystemButtonDarkModeRenderer : ButtonDarkModeRendererBase
     /// <summary>
     ///  Draws button background with system styling (larger rounded corners).
     /// </summary>
-    public override Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault)
+    public override Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault, Color backColor)
     {
         // Shrink for DarkBorderGap and FocusBorderThickness
         Rectangle fillBounds = Rectangle.Inflate(bounds, -SystemStylePadding, -SystemStylePadding);
 
         using GraphicsPath fillPath = CreateRoundedRectanglePath(fillBounds, CornerRadius - DarkBorderGapThickness);
 
-        // Get appropriate background color based on state
-        Color backColor = GetBackgroundColor(state, isDefault);
-
         // Fill the background using cached brush
         using var brush = backColor.GetCachedSolidBrushScope();
         graphics.FillPath(brush, fillPath);
@@ -82,7 +79,7 @@ public override Color GetTextColor(PushButtonState state, bool isDefault) =>
     /// <summary>
     ///  Gets the background color appropriate for the button state and type.
     /// </summary>
-    private static Color GetBackgroundColor(PushButtonState state, bool isDefault) =>
+    public override Color GetBackgroundColor(PushButtonState state, bool isDefault) =>
         // For default button in System style, use a darker version of the background color
         isDefault
             ? state switch
@@ -114,7 +111,7 @@ private static Color GetBackgroundColor(PushButtonState state, bool isDefault) =
     /// <summary>
     ///  Draws the button border based on the current state, using anti-aliasing and an additional inner border.
     /// </summary>
-    public static void DrawButtonBorder(
+    public void DrawButtonBorder(
         Graphics graphics,
         Rectangle bounds,
         PushButtonState state,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+override System.Windows.Forms.ButtonBase.OnBackColorChanged(System.EventArgs! e) -> void`
	`2`	`+override System.Windows.Forms.ButtonBase.OnForeColorChanged(System.EventArgs! e) -> void`
`1`	`3`	`static System.Windows.Forms.Application.SetColorMode(System.Windows.Forms.SystemColorMode systemColorMode) -> void`
`2`	`4`	`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!>!`
`3`	`5`	`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!>!`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public void RenderButton(`
`37`	`37`	`bool focused,`
`38`	`38`	`bool showFocusCues,`
`39`	`39`	`Color parentBackgroundColor,`
	`40`	`+ Color backColor,`
`40`	`41`	`Action<Rectangle> paintImage,`
`41`	`42`	`Action<Rectangle, Color, bool> paintField)`
`42`	`43`	`{`
`@@ -60,7 +61,7 @@ public void RenderButton(`
`60`	`61`	`height: bounds.Height - padding.Vertical);`
`61`	`62`
`62`	`63`	`// Draw button background and get content bounds`
`63`		`- Rectangle contentBounds = DrawButtonBackground(graphics, paddedBounds, state, isDefault);`
	`64`	`+ Rectangle contentBounds = DrawButtonBackground(graphics, paddedBounds, state, isDefault, backColor);`
`64`	`65`
`65`	`66`	`// Paint image and field using the provided delegates`
`66`	`67`	`paintImage(contentBounds);`
`@@ -78,9 +79,11 @@ public void RenderButton(`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`
`81`		`- public abstract Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault);`
	`82`	`+ public abstract Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault, Color backColor);`
`82`	`83`
`83`	`84`	`public abstract void DrawFocusIndicator(Graphics graphics, Rectangle contentBounds, bool isDefault);`
`84`	`85`
`85`	`86`	`public abstract Color GetTextColor(PushButtonState state, bool isDefault);`
	`87`	`+`
	`88`	`+ public abstract Color GetBackgroundColor(PushButtonState state, bool isDefault);`
`86`	`89`	`}`