Update Reset GraphicState approach per Review.

Author: KlausLoeffelmann

src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Windows.Forms.VisualStyles;
 
 namespace System.Windows.Forms;
@@ -45,14 +44,9 @@ public void RenderButton(
         ArgumentNullException.ThrowIfNull(paintImage);
         ArgumentNullException.ThrowIfNull(paintField);
 
-        GraphicsState? graphicsState = default;
-
-        try
+        // Scope the graphics state so all changes are reverted after rendering
+        using (new GraphicsStateScope(graphics))
         {
-            // Save the graphics state, so we can restore it later and the
-            // overrides do not to be concerned with restoring the state.
-            graphicsState = graphics.Save();
-
             // Clear the background over the whole button area.
             ClearBackground(graphics, parentBackgroundColor);
 
@@ -82,14 +76,6 @@ public void RenderButton(
                 DrawFocusIndicator(graphics, bounds, isDefault);
             }
         }
-        finally
-        {
-            if (graphicsState is not null)
-            {
-                // Restore the graphics state to ensure no side effects
-                graphics.Restore(graphicsState);
-            }
-        }
     }
 
     public abstract Rectangle DrawButtonBackground(Graphics graphics, Rectangle bounds, PushButtonState state, bool isDefault);