Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix retrieving the size of item label in native MSW wxListCtrl

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/1461

Closes #11355.
This commit is contained in:
oneeyeman1
2019-08-02 18:52:12 -05:00
committed by Vadim Zeitlin
parent 32d8b5954a
commit da524ebacb
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/listctrl/listtest.cpp
View File

@@ -1247,7 +1247,6 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
{ {
LogEvent(event, "OnListKeyDown"); LogEvent(event, "OnListKeyDown");
event.Skip(); event.Skip();
return;
} }
switch ( event.GetKeyCode() ) switch ( event.GetKeyCode() )
@@ -1325,10 +1324,15 @@ void MyListCtrl::OnListKeyDown(wxListEvent& event)
wxLogError("Failed to retrieve rect of item %ld column %d", item, subItem + 1); wxLogError("Failed to retrieve rect of item %ld column %d", item, subItem + 1);
break; break;
} }
wxString message = "Bounding rect of %s item %ld column %d is (%d, %d)-(%d, %d)";
wxLogMessage("Bounding rect of item %ld column %d is (%d, %d)-(%d, %d)", wxString part;
item, subItem + 1, if( code == wxLIST_RECT_BOUNDS )
r.x, r.y, r.x + r.width, r.y + r.height); part = "subitem";
if( code == wxLIST_RECT_ICON )
part = "icon";
if( code == wxLIST_RECT_LABEL )
part = "label";
wxLogMessage( message, part, item, subItem + 1, r.x, r.y, r.x + r.width, r.y + r.height );
} }
break; break;

10
src/msw/listctrl.cpp
View File

@@ -1241,6 +1241,16 @@ bool wxListCtrl::GetSubItemRect(long item, long subItem, wxRect& rect, int code)
{ {
return false; return false;
} }
if( code == wxLIST_RECT_LABEL )
{
RECT rectIcon;
rectIcon.top = subItem;
rectIcon.left = LVIR_ICON;
if( !( ::SendMessageA(GetHwnd(), LVM_GETSUBITEMRECT, item, (LPARAM)&rectIcon) ) )
return false;
else
rectWin.left = rectIcon.right;
}
wxCopyRECTToRect(rectWin, rect); wxCopyRECTToRect(rectWin, rect);