MSW: Dark mode for common dialogs (PR #26780)
Steve Cornett
This PR introduces an architecture for adding dark mode support to the common dialogs, wxColourDialog, wxFindReplaceDialog, wxFontDialog, wxPageSetupDialog, wxPrintDialog. The initial implementation is for only the two simplest dialogs, wxColourDialog and wxFindReplaceDialog.
A new function wxMSWDarkMode::DialogHookProc() encapsulates the implementation. This function can be called from an existing dialog hook procedure, or can be set as the dialog hook procedure if there is none already. This hook handles dialog messages to enable dark mode on the dialog window and children. For configuring the children, there are two basic methods. If the theme DarkMode_DarkTheme is available, that is used and the appearance is quite good. For older Windows versions, the various classes of controls need special handling. There is currently special handling for Button and Edit controls. More complicated controls such as ComboBox will need to be subclassed and owner-drawn, but that is not implemented yet.
See #26599.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26780
Commit Summary
- 3944afd Dark mode for common dialogs
File Changes
(4 files)
- M include/wx/msw/private/darkmode.h (4)
- M src/msw/colordlg.cpp (7)
- M src/msw/darkmode.cpp (95)
- M src/msw/fdrepdlg.cpp (7)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26780.patch
- https://github.com/wxWidgets/wxWidgets/pull/26780.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
@stevecor pushed 1 commit.
- 1ff3f85 Fix use of deprecated macro
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
stevecor left a comment (wxWidgets/wxWidgets#26780)The appearance of wxColourDialog:
The appearance of wxFindReplaceDialog with and without DarkMode_DarkTheme below:
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
Thanks, it's rather amazing that the results are so good with only relatively few changes.
Do you understand why wxButton looks fine in dark mode (with the appropriate theme) while the buttons in the dialogs do not? It's also a bit weird to use a different workaround for the buttons here and in src/msw/taskdlg.cpp but I guess we can live with it as long as it's simple enough.
> + }
+ return true;
+}
+
+UINT_PTR CALLBACK DialogHookProc(HWND hwnd, UINT uiMsg, WPARAM wParam,
+ LPARAM WXUNUSED(lParam))
+{
+ if ( !IsActive() )
+ return 0;
+
+ // Window background brush. There is only one handle instance which is
+ // adequate if there is only one common dialog shown at a time. In the
+ // unlikely event more than one is shown at a time, the only problem is
+ // some dark/light drawing inconsistencies, which is an acceptable
+ // trade-off for the simplicity of managing this handle locally.
+ static HBRUSH s_bgBrush = nullptr;
Why not use wxTheBrushList? Chances are this brush is already used elsewhere anyhow in dark mode and like this we don't need to bother with not leaking it.
> + // adequate if there is only one common dialog shown at a time. In the
+ // unlikely event more than one is shown at a time, the only problem is
+ // some dark/light drawing inconsistencies, which is an acceptable
+ // trade-off for the simplicity of managing this handle locally.
+ static HBRUSH s_bgBrush = nullptr;
+
+ switch ( uiMsg )
+ {
+ case WM_INITDIALOG:
+ // Enable dark for dialog window.
+ wxMSWDarkMode::ConfigureTLW(hwnd);
+ s_bgBrush = CreateSolidBrush(
+ wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE).GetPixel());
+
+ // Enable dark mode for children.
+ EnumChildWindows(hwnd, EnableDialogChild, 0);
This is very minor but we usually use :: to show that we're calling global Win32 functions, not wx ones, i.e.
- EnumChildWindows(hwnd, EnableDialogChild, 0); + ::EnumChildWindows(hwnd, EnableDialogChild, 0);
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
@stevecor pushed 1 commit.
- a64bd70 Fix background brush
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
stevecor left a comment (wxWidgets/wxWidgets#26780)Do you understand why
wxButtonlooks fine in dark mode (with the appropriate theme) while the buttons in the dialogs do not?
I used the wrong background color (wxSYS_COLOUR_BTNFACE instead of wxSYS_COLOUR_WINDOW).
It's also a bit weird to use a different workaround for the buttons here and in
src/msw/taskdlg.cppbut I guess we can live with it as long as it's simple enough.
I cannot understand the code in taskdlg.cpp. I search through it on "button" but I cannot follow how it works.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
@stevecor pushed 1 commit.
- 3809a64 Fix child control colors
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26780)I cannot understand the code in
taskdlg.cpp. I search through it on "button" but I cannot follow how it works.
AFAIR it just does it pixel-by-pixel in TDPaintPixelSwap(). It's not the most elegant approach, but it works (under Windows 10).
OTOH an even better question might be how does it work there under Windows 11, with its native dark theme: could we perhaps apply DarkMode_DarkTheme::TaskDialog to the other dialogs too?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
PB
@PBfordev commented on this pull request.
> + switch ( uiMsg )
+ {
+ case WM_INITDIALOG:
+ // Enable dark for dialog window.
+ wxMSWDarkMode::ConfigureTLW(hwnd);
+ // Enable dark mode for children.
+ ::EnumChildWindows(hwnd, EnableDialogChild, 0);
+ break;
+
+ case WM_CTLCOLORBTN:
+ case WM_CTLCOLORDLG:
+ return (INT_PTR)GetBackgroundBrush();
+
+ case WM_CTLCOLOREDIT:
+ case WM_CTLCOLORSTATIC:
+ SetBkColor((HDC)wParam,
Nitpick as usual
⬇️ Suggested change- SetBkColor((HDC)wParam, + ::SetBkColor((HDC)wParam,
You use the global scope resolution operator for Win32 API everywhere else except here and SetTextColor() and GetBackgroundBrush() below.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
@stevecor pushed 2 commits.
- ab3fac8 Fix check box color on old Windows
- 6fd3e36 Add dark mode support for wxFontDialog and wxPageSetupDialog
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
stevecor left a comment (wxWidgets/wxWidgets#26780)Here is how the dialogs look on current Windows 11 (left) and old Windows 10 (right). For older Windows versions, check box tick marks are still light mode. I don't have any good idea how to handle that. In wxFontDialog, the Sample is not a control, and therefore I did not try to fix that. I did not address the wxPrintDialog class. The wxPrinter class already supports dark mode.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
@stevecor pushed 1 commit.
- 25291ee Add dark mode check box drawing
—
View it on GitHub or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.
Steve Cornett
stevecor left a comment (wxWidgets/wxWidgets#26780)Check boxes are implemented for old Windows versions.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS and Android. Download it today!
You are receiving this because you are subscribed to this thread.