Skip to content

Address Graphics state reset issue in DarkMode Button renderers #13641

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

Merged
merged 1 commit into from
Jul 16, 2025
Merged

Address Graphics state reset issue in DarkMode Button renderers #13641

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
62 changes: 30 additions & 32 deletions ...stem/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeRendererBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,39 +44,37 @@ public void RenderButton(
ArgumentNullException.ThrowIfNull(paintImage);
ArgumentNullException.ThrowIfNull(paintField);

// Clear the background over the whole button area.
ClearBackground(graphics, parentBackgroundColor);

// Use padding from ButtonDarkModeRenderer
Padding padding = PaddingCore;

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 = 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,
GetTextColor(state, isDefault),
false);

if (focused && showFocusCues)
// Scope the graphics state so all changes are reverted after rendering
using (new GraphicsStateScope(graphics))
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
using (new GraphicsStateScope(graphics))
using GraphicsStateScope graphicsScope = new(graphics);

{
// Draw focus indicator for other styles
DrawFocusIndicator(graphics, bounds, isDefault);
// Clear the background over the whole button area.
ClearBackground(graphics, parentBackgroundColor);

// Use padding from ButtonDarkModeRenderer
Padding padding = PaddingCore;

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 = DrawButtonBackground(graphics, paddedBounds, state, isDefault);

// Paint image and field using the provided delegates
paintImage(contentBounds);

paintField(
contentBounds,
GetTextColor(state, isDefault),
false);

if (focused && showFocusCues)
{
// Draw focus indicator for other styles
DrawFocusIndicator(graphics, bounds, isDefault);
}
}
}

Expand Down
Loading