Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Don't use CListBox itemData for drawing text, it doesn't actually point to the item string

Browse source
This commit is contained in:
kaetemi 2019-05-14 06:32:37 +08:00
parent 6cc30e7e6b
commit f688c23580
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.cpp
View file

@ -118,13 +118,12 @@ const string &CToolsZoneList::getItem (uint32 nIndex)
void CToolsZoneList::DrawItem (LPDRAWITEMSTRUCT lpDrawItemStruct) void CToolsZoneList::DrawItem (LPDRAWITEMSTRUCT lpDrawItemStruct)
{ {
ASSERT(lpDrawItemStruct->CtlType == ODT_LISTBOX); ASSERT(lpDrawItemStruct->CtlType == ODT_LISTBOX);
LPCTSTR lpszText = (LPCTSTR) lpDrawItemStruct->itemData;
if (lpszText == NULL)
return;
CDC dc; CDC dc;
if (lpDrawItemStruct->itemID >= _BitmapList.size()) if (lpDrawItemStruct->itemID >= _BitmapList.size())
return; return;
if (lpDrawItemStruct->itemID >= _ItemNames.size())
return;
dc.Attach (lpDrawItemStruct->hDC); dc.Attach (lpDrawItemStruct->hDC);
@ -168,7 +167,8 @@ void CToolsZoneList::DrawItem (LPDRAWITEMSTRUCT lpDrawItemStruct)
} }
// Draw the text. // Draw the text.
dc.DrawText (lpszText, _tcslen(lpszText), &rectLeft, DT_CENTER|DT_SINGLELINE|DT_VCENTER); NLMISC::tstring itemName = NLMISC::utf8ToTStr(_ItemNames[lpDrawItemStruct->itemID]);
dc.DrawText(itemName.c_str(), itemName.size(), &rectLeft, DT_CENTER|DT_SINGLELINE|DT_VCENTER);
// Reset the background color and the text color back to their original values. // Reset the background color and the text color back to their original values.
dc.SetTextColor (crOldTextColor); dc.SetTextColor (crOldTextColor);