Skip to content

Fix DarkMode Button Render #13446

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix DarkMode Button Render #13446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf09c6a
Fix DarkMode Button Render
memoarfaa May 13, 2025
324c983
Merge branch 'dotnet:main' into DarkMod_Fixes
memoarfaa May 13, 2025
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
12 changes: 11 additions & 1 deletion src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,20 @@ namespace System.Windows.Forms;
/// </summary>
public static class ButtonRenderer
{
private const string DarkModeThemeIdentifier = $"{Control.DarkModeIdentifier}_{Control.ExplorerThemeIdentifier}::{PInvoke.WC_BUTTON}";

// Make this per-thread, so that different threads can safely use these methods.
[ThreadStatic]
private static VisualStyleRenderer? t_visualStyleRenderer;
private static readonly VisualStyleElement s_buttonElement = VisualStyleElement.Button.PushButton.Normal;
#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
private static readonly VisualStyleElement s_darkButtonElement =
VisualStyleElement.CreateElement(DarkModeThemeIdentifier, 1, 1);
private static readonly VisualStyleElement s_lightButtonElement = VisualStyleElement.Button.PushButton.Normal;
private static readonly VisualStyleElement s_buttonElement =
Application.IsDarkModeEnabled
? s_darkButtonElement
: s_lightButtonElement;
#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.

/// <summary>
/// Gets or sets a value indicating whether the renderer uses the application state to determine rendering style.
Expand Down
10 changes: 10 additions & 0 deletions src/System.Windows.Forms/System/Windows/Forms/VisualStyles/VisualStyleRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,16 @@ internal unsafe void DrawBackground(HDC dc, Rectangle bounds, HWND hwnd = defaul

if (!hwnd.IsNull)
{
// in DarkMode we alwayes use OpenThemeData with defult HWNND if the HWND is not null,
// UxTheme has another Method for drawing if Dpi greater than 96,
// Especially when per-monitor aware we need to remove the subclassing. .
uint dpi = PInvoke.GetDpiForWindow(hwnd);
if (dpi > 96 && Class == $"{Control.DarkModeIdentifier}_" +
$"{Control.ExplorerThemeIdentifier}::{PInvoke.WC_BUTTON}")
{
Class = Class[19..];
}

using var htheme = OpenThemeData(hwnd, Class);
_lastHResult = PInvoke.DrawThemeBackground(htheme, dc, Part, State, bounds, null);
}
Expand Down