solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Erase unwanted list view separators in dark mode under Windows 11

Browse source 
For some reason, "DarkMode_Explorer" theme started drawing vertical item
separators under Windows 11 even though it did not do this under Windows
10. These separators are unwanted, as they are not shown in the Explorer
list control that we try to emulate, and look ugly because they are
shifted by 1px compared to the separators drawn by the header control
with "ItemsView" theme, which is the only one in which the header looks
right in dark mode.

So explicitly erase everything below the last item when using dark mode
under Windows 11 to get rid of these separators.
This commit is contained in:
Vadim Zeitlin 2023-06-05 00:24:24 +01:00
parent 4cd1483122
commit 9710592cc4
1 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/msw/listctrl.cpp
View file

@ -3362,7 +3362,21 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
const bool drawHRules = HasFlag(wxLC_HRULES);
const bool drawVRules = HasFlag(wxLC_VRULES);
if (!InReportView() || !(drawHRules || drawVRules) || !itemCount)
// Check if we need to do anything ourselves: either draw the rules or, in
// case of using dark mode under Windows 11, erase the unwanted separator
// lines drawn below the items by default, which are ugly because they
// don't align with the separators drawn by the header control.
bool needToDraw = false,
needToErase = false;
if ( InReportView() )
{
if ( (drawHRules || drawVRules) && itemCount )
needToDraw = true;
else if ( wxMSWDarkMode::IsActive() && wxGetWinVersion() >= wxWinVersion_11 )
needToErase = true;
}
if ( !(needToDraw || needToErase) )
{
event.Skip();
return;
@ -3375,10 +3389,6 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
// Reset the device origin since it may have been set
dc.SetDeviceOrigin(0, 0);
wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT));
dc.SetPen(pen);
dc.SetBrush(* wxTRANSPARENT_BRUSH);
wxSize clientSize = GetClientSize();
const int countPerPage = GetCountPerPage();
@ -3391,6 +3401,21 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
const long top = GetTopItem();
const long bottom = wxMin(top + countPerPage, itemCount - 1);
if ( needToErase )
{
wxRect lastRect;
GetItemRect(bottom, lastRect);
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(GetBackgroundColour());
dc.DrawRectangle(0, lastRect.y, clientSize.x, clientSize.y - lastRect.y);
return;
}
wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT));
dc.SetPen(pen);
dc.SetBrush(* wxTRANSPARENT_BRUSH);
if (drawHRules)
{
wxRect itemRect;