Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 17:02:51 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix highlighting first item in MSW wxListCtrl in dark mode

Browse Source 
The item was also highlighted when hovering over the header because ListView_HitTest
returns true when hovering over the header.
Replace ListView_HitTest by checking if the mouse pointer is in the item rectangle.
This commit is contained in:
Maarten Bent
2025-11-30 20:42:45 +01:00
parent 47891abefe
commit 96e7dcddf6
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/msw/listctrl.cpp
+7 -8
View File
@@ -3307,6 +3307,9 @@ void HandleItemPaint(wxListCtrl* listctrl, LPNMLVCUSTOMDRAW pLVCD)
const HWND hwndList = nmcd.hdr.hwndFrom;
const int item = nmcd.dwItemSpec;
RECT rc = GetCustomDrawnItemRect(nmcd);
HDC hdc = nmcd.hdc;
// unfortunately we can't trust CDIS_SELECTED, it is often set even when
// the item is not at all selected for some reason (comctl32 6), but we
// also can't always trust ListView_GetItem() as it could return the old
@@ -3340,11 +3343,10 @@ void HandleItemPaint(wxListCtrl* listctrl, LPNMLVCUSTOMDRAW pLVCD)
}
// determine if the item is hot (mouse hovering over it)
LV_HITTESTINFO lvhti;
wxZeroMemory(lvhti);
wxGetCursorPosMSW(&(lvhti.pt));
::ScreenToClient(GetHwndOf(listctrl), &lvhti.pt);
if ( listctrl->IsEnabled() && ListView_HitTest(GetHwndOf(listctrl), &lvhti) == item )
POINT point;
::wxGetCursorPosMSW(&point);
::ScreenToClient(GetHwndOf(listctrl), &point);
if ( listctrl->IsEnabled() && ::PtInRect(&rc, point) != 0 )
{
nmcd.uItemState |= CDIS_HOT;
}
@@ -3353,9 +3355,6 @@ void HandleItemPaint(wxListCtrl* listctrl, LPNMLVCUSTOMDRAW pLVCD)
nmcd.uItemState &= ~CDIS_HOT;
}
HDC hdc = nmcd.hdc;
RECT rc = GetCustomDrawnItemRect(nmcd);
wxColour clrBg = listctrl->GetBackgroundColour();
if ( nmcd.uItemState & CDIS_SELECTED )
clrBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);