Update renderer.

Author: KlausLoeffelmann

src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/ButtonDarkModeAdapter.cs

@@ -18,6 +18,9 @@ internal ButtonDarkModeAdapter(ButtonBase control) : base(control) { }
 
     internal override void PaintUp(PaintEventArgs e, CheckState state)
     {
+        var smoothingMode = e.Graphics.SmoothingMode;
+        e.Graphics.SmoothingMode = Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
         LayoutData layout = CommonLayout().Layout();
 
         ButtonDarkModeRenderer.RenderButton(
@@ -37,10 +40,16 @@ internal override void PaintUp(PaintEventArgs e, CheckState state)
                 textColor,
                 drawFocus: false)
         );
+
+        e.Graphics.SmoothingMode = smoothingMode;
     }
 
     internal override void PaintDown(PaintEventArgs e, CheckState state)
     {
+        // Set the smoothing mode to AntiAlias for better rendering quality
+        var smoothingMode = e.Graphics.SmoothingMode;
+        e.Graphics.SmoothingMode = Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
         LayoutData layout = CommonLayout().Layout();
         ButtonDarkModeRenderer.RenderButton(
             e.Graphics,
@@ -59,10 +68,17 @@ internal override void PaintDown(PaintEventArgs e, CheckState state)
                 textColor,
                 drawFocus: false)
         );
+
+        // Restore the original smoothing mode
+        e.Graphics.SmoothingMode = smoothingMode;
     }
 
     internal override void PaintOver(PaintEventArgs e, CheckState state)
     {
+        // Set the smoothing mode to AntiAlias for better rendering quality
+        var smoothingMode = e.Graphics.SmoothingMode;
+        e.Graphics.SmoothingMode = Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
         LayoutData layout = CommonLayout().Layout();
         ButtonDarkModeRenderer.RenderButton(
             e.Graphics,
@@ -81,6 +97,9 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
                 textColor,
                 drawFocus: false)
         );
+
+        // Restore the original smoothing mode
+        e.Graphics.SmoothingMode = smoothingMode;
     }
 
     protected override LayoutOptions Layout(PaintEventArgs e) => CommonLayout();

src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/DarkModeRenderer/ButtonDarkModeRenderer.cs

@@ -12,20 +12,17 @@ namespace System.Windows.Forms;
 /// </summary>
 internal static partial class ButtonDarkModeRenderer
 {
-    // Magic numbers extracted as constants or static properties
-    private const int DefaultPaddingValue = 2;
-
     // Singleton instances for each renderer type
     internal static IButtonDarkModeRenderer StandardRenderer { get; } = new StandardButtonDarkModeRenderer();
     internal static IButtonDarkModeRenderer FlatRenderer { get; } = new FlatButtonDarkModeRenderer();
     internal static IButtonDarkModeRenderer PopupRenderer { get; } = new PopupButtonDarkModeRenderer();
     internal static IButtonDarkModeRenderer SystemRenderer { get; } = new SystemButtonDarkModeRenderer();
 
     // Define padding values for each renderer type
-    internal static Padding StandardPaddingCore { get; } = new(DefaultPaddingValue);
-    internal static Padding FlatPaddingCore { get; } = new(DefaultPaddingValue);
-    internal static Padding PopupPaddingCore { get; } = new(DefaultPaddingValue);
-    internal static Padding SystemPaddingCore { get; } = new(DefaultPaddingValue);
+    internal static Padding StandardPaddingCore { get; } = new(0);
+    internal static Padding FlatPaddingCore { get; } = new(0);
+    internal static Padding PopupPaddingCore { get; } = new(0);
+    internal static Padding SystemPaddingCore { get; } = new(0);
 
     /// <summary>
     ///  Returns the appropriate padding for the specified flat style.
@@ -52,13 +49,8 @@ public static void DrawButtonBorder(Graphics graphics, GraphicsPath path, Color
     ///  Clears the background with the parent's background color or the control's background color if no parent is available.
     /// </summary>
     /// <param name="graphics">Graphics context to draw on</param>
-    /// <param name="bounds">Bounds of the area to clear</param>
-    private static void ClearBackground(Graphics graphics, Rectangle bounds, Color parentBackgroundColor)
-    {
-        // Clear the background with the determined color
-        using var brush = parentBackgroundColor.GetCachedSolidBrushScope();
-        graphics.FillRectangle(brush, bounds);
-    }
+    private static void ClearBackground(Graphics graphics, Color parentBackgroundColor) =>
+        graphics.Clear(parentBackgroundColor);
 
     /// <summary>
     ///  Renders a button with the specified properties and delegates for painting image and field.
@@ -84,24 +76,43 @@ internal static void RenderButton(
         };
 
         // Background over the whole Button area needs to be cleared in any case.
-        ClearBackground(graphics, bounds, parentBackgroundColor);
+        ClearBackground(graphics, parentBackgroundColor);
 
         // Use padding from ButtonDarkModeRenderer
         Padding padding = GetPaddingCore(FlatStyle.System);
-        Rectangle paddedBounds = Rectangle.Inflate(bounds, -padding.Left, -padding.Top);
+        Rectangle paddedBounds = new(
+            x: bounds.X + padding.Left,
+            y: bounds.Y + padding.Top,
+            width: bounds.Width - padding.Horizontal,
+            height: bounds.Height - padding.Vertical);
 
         // Draw button background and get content bounds
         Rectangle contentBounds = renderer.DrawButtonBackground(graphics, paddedBounds, state, isDefault);
 
+        // Offset content bounds for Popup style when button is pressed
+        if (flatStyle == FlatStyle.Popup && state == PushButtonState.Pressed)
+        {
+            contentBounds.Offset(1, 1);
+        }
+
         // Paint image and field using the provided delegates
         paintImage(contentBounds);
+
         paintField(
             contentBounds,
             renderer.GetTextColor(state, isDefault),
             false);
 
+        if (focused && flatStyle == FlatStyle.System)
+        {
+            // Focus with the system renderer is completely surrounded by a border.
+            renderer.DrawFocusIndicator(graphics, bounds, isDefault);
+            return;
+        }
+
         if (focused && showFocusCues)
         {
+            // Draw focus indicator for other styles
             renderer.DrawFocusIndicator(graphics, contentBounds, isDefault);
         }
     }

src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/DarkModeRenderer/PopupButtonDarkModeRenderer.cs

@@ -90,10 +90,6 @@ public Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushB
     /// </summary>
     public void DrawFocusIndicator(Graphics graphics, Rectangle contentBounds, bool isDefault)
     {
-        // Save original smoothing mode
-        SmoothingMode originalMode = graphics.SmoothingMode;
-        graphics.SmoothingMode = SmoothingMode.AntiAlias;
-
         // Create a slightly smaller rectangle for the focus indicator
         Rectangle focusRect = Rectangle.Inflate(contentBounds, -FocusPadding, -FocusPadding);
 
@@ -110,9 +106,6 @@ public void DrawFocusIndicator(Graphics graphics, Rectangle contentBounds, bool
         // Draw the focus rectangle with rounded corners
         GraphicsPath focusPath = GetRoundedRectanglePath(focusRect, FocusCornerRadius);
         graphics.DrawPath(focusPen, focusPath);
-
-        // Restore original smoothing mode
-        graphics.SmoothingMode = originalMode;
     }
 
     /// <summary>

src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/DarkModeRenderer/StandardButtonDarkModeRenderer.cs

@@ -53,10 +53,6 @@ public Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushB
     /// </summary>
     public void DrawFocusIndicator(Graphics graphics, Rectangle contentBounds, bool isDefault)
     {
-        // Save original smoothing mode
-        SmoothingMode originalMode = graphics.SmoothingMode;
-        graphics.SmoothingMode = SmoothingMode.AntiAlias;
-
         // Create a slightly smaller rectangle for the focus indicator
         Rectangle focusRect = Rectangle.Inflate(contentBounds, -FocusIndicatorInset, -FocusIndicatorInset);
 
@@ -73,9 +69,6 @@ public void DrawFocusIndicator(Graphics graphics, Rectangle contentBounds, bool
         // Draw the focus rectangle with rounded corners
         using GraphicsPath focusPath = GetRoundedRectanglePath(focusRect, FocusIndicatorCornerRadius);
         graphics.DrawPath(focusPen, focusPath);
-
-        // Restore original smoothing mode
-        graphics.SmoothingMode = originalMode;
     }
 
     /// <summary>