interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flipped the memory corruption back on so we can debug it.

This commit is contained in:
Pietro Gagliardi 2018-06-12 20:15:59 -04:00
parent f216af94e7
commit c4251894b5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
windows/table.cpp
View File

@ -145,7 +145,7 @@ static HRESULT fillSubitemDrawParams(HWND hwnd, NMLVCUSTOMDRAW *nm, uiprivSubite
// note that we can't just copy nm->nmcd.rc into p->bounds because that is only defined during prepaint stages // note that we can't just copy nm->nmcd.rc into p->bounds because that is only defined during prepaint stages
// TODO this corrupts memory // TODO this corrupts memory
if (nm->iSubItem == 0) {return S_OK; if (nm->iSubItem == 0) {
ZeroMemory(&r, sizeof (RECT)); ZeroMemory(&r, sizeof (RECT));
r.left = LVIR_BOUNDS; r.left = LVIR_BOUNDS;
if (SendMessageW(hwnd, LVM_GETITEMRECT, nm->nmcd.dwItemSpec, (LPARAM) (&r)) == FALSE) { if (SendMessageW(hwnd, LVM_GETITEMRECT, nm->nmcd.dwItemSpec, (LPARAM) (&r)) == FALSE) {
@ -219,7 +219,7 @@ static LRESULT onNM_CUSTOMDRAW(uiTable *t, NMLVCUSTOMDRAW *nm)
} }
} }
t->clrItemText = nm->clrText; t->clrItemText = nm->clrText;
ret = CDRF_NEWFONT | CDRF_NOTIFYSUBITEMDRAW; ret = CDRF_NOTIFYSUBITEMDRAW;
break; break;
case CDDS_SUBITEM | CDDS_ITEMPREPAINT: case CDDS_SUBITEM | CDDS_ITEMPREPAINT:
p = (*(t->columns))[nm->iSubItem]; p = (*(t->columns))[nm->iSubItem];
@ -235,10 +235,10 @@ static LRESULT onNM_CUSTOMDRAW(uiTable *t, NMLVCUSTOMDRAW *nm)
} }
} }
// TODO draw background on image columns if needed // TODO draw background on image columns if needed
ret = CDRF_SKIPDEFAULT | CDRF_NEWFONT; ret = /*CDRF_SKIPDEFAULT | */CDRF_NEWFONT;
break; break;
case CDDS_SUBITEM | CDDS_ITEMPOSTPAINT: //case CDDS_SUBITEM | CDDS_ITEMPOSTPAINT:
if(nm->iSubItem == 1) { if(0){//nm->iSubItem == 1) {
RECT r, r2; RECT r, r2;
r.left = LVIR_LABEL; r.left = LVIR_LABEL;
r.top = 1; r.top = 1;
@ -253,7 +253,6 @@ DrawTextW(nm->nmcd.hdc, L"Part", -1,
return CDRF_DODEFAULT; return CDRF_DODEFAULT;
} }
if ((nm->nmcd.dwDrawStage & CDDS_SUBITEM) == 0)return ret;
ZeroMemory(&dp, sizeof (uiprivSubitemDrawParams)); ZeroMemory(&dp, sizeof (uiprivSubitemDrawParams));
hr = fillSubitemDrawParams(t->hwnd, nm, &dp); hr = fillSubitemDrawParams(t->hwnd, nm, &dp);
if (hr != S_OK) { if (hr != S_OK) {