MSW: Dark mode borders (PR #26571)
Steve Cornett
For Windows dark mode, draw themed borders instead of translating wxBORDER_THEME to wxBORDER_SIMPLE. Borders have the same thickness between light mode and dark mode for consistent alignment and positioning. See #26529.
In dark mode, the border styles wxBORDER_STATIC, wxBORDER_RAISED and wxBORDER_SUNKEN are sometimes drawn by the system using light mode colours. So draw these borders similarly to themed borders, but using the proper width. There is no attempt to mimic a raised or sunken look.
The WM_NCPAINT and WM_NCPAINT message handling is simplified and corrected for calculating the border width.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26571
Commit Summary
- ea7ba97 Dark mode borders
File Changes
(2 files)
- M src/msw/textctrl.cpp (27)
- M src/msw/window.cpp (106)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26571.patch
- https://github.com/wxWidgets/wxWidgets/pull/26571.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.
VZ
@vadz commented on this pull request.
Thanks, I didn't test this yet but the changes look good to me.
> + static_assert(EP_EDITTEXT == LVP_LISTITEM); + static_assert(ETS_NORMAL == LISS_NORMAL);
Need to cast to int to avoid warnings and probably should provide a message to avoid requiring C++14.
> ::ExcludeClipRect(GetHdcOf(*impl), rcClient.left, rcClient.top,
rcClient.right, rcClient.bottom);
+ // Draw the theme border and background.
+
+ // The EDIT theme gives a good general purpose border in light mode.
+ // There does not seem to be a dark mode EDIT theme that looks good.
+ // The ListView theme below looks good in dark mode.
+ wxUxThemeHandle hTheme(this, L"EDIT", L"DarkMode_DarkTheme::ListView");
I wonder if it could be worth caching this theme to avoid opening/closing it all the time. I have no idea how expensive this is, so maybe it's not worth it, but OTOH keeping it open (as a global var) should be pretty simple.
> - // If GetThemeBackgroundContentRect() failed, as can - // happen with at least some custom themes, just use - // the original client rectangle. - rcClient = *rect; - } - - InflateRect(&rcClient, -1, -1); - if (wParam) - csparam->rgrc[0] = rcClient; - else - *((RECT*)lParam) = rcClient; - - // WVR_REDRAW triggers a bug whereby child windows are moved up and left, - // so don't use. - // rc.result = WVR_REDRAW; + const auto borderWidth = GetWindowBorderSize().x / 2;
I wonder if it could make sense to add some MSWGetBorderThickness() returning just this, i.e. a single int, not multiplied by 2, unlike GetWindowBorderSize() which returns a wxSize multiplied by it.
The idea being is that / 2 begs the question of what happens when the value is odd, which actually can never happen, but this is not really obvious.
> - if (DoTranslateBorder(GetBorder()) == wxBORDER_THEME)
+ // Determine whether we should draw a border.
+ bool drawBorder = false;
+ switch ( DoTranslateBorder(GetBorder()) )
+ {
+ case wxBORDER_THEME:
+ drawBorder = true;
+ break;
+ case wxBORDER_STATIC:
+ case wxBORDER_RAISED:
+ case wxBORDER_SUNKEN:
+ // In dark mode, explicitly draw these border styles because
+ // the default drawing uses light mode colours.
+ drawBorder = wxMSWDarkMode::IsActive();
+ break;
+ }
I'd add the cases for the other values (SIMPLE and NONE) just to make it clear that we do handle them here.
—
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.
- 17a1118 Fix warning
—
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 commented on this pull request.
> ::ExcludeClipRect(GetHdcOf(*impl), rcClient.left, rcClient.top,
rcClient.right, rcClient.bottom);
+ // Draw the theme border and background.
+
+ // The EDIT theme gives a good general purpose border in light mode.
+ // There does not seem to be a dark mode EDIT theme that looks good.
+ // The ListView theme below looks good in dark mode.
+ wxUxThemeHandle hTheme(this, L"EDIT", L"DarkMode_DarkTheme::ListView");
I timed this with wxStopWatch and got just 11µs for 242 calls.
—
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.
- 0345e1b Add all border switch cases
—
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.
- 9c0bd0f Add MSWGetBorderThickness()
—
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.
- c34e1f1 Fix conversion error
—
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.