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

Started work on backgrounds. This isn't ideal quite yet, but.

This commit is contained in:
Pietro Gagliardi 2018-06-13 10:09:13 -04:00
parent c01b010fd7
commit 15bc55dd5e
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
windows/table.cpp
View File

@ -133,7 +133,6 @@ 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
if (nm->iSubItem == 0) { if (nm->iSubItem == 0) {
ZeroMemory(&r, sizeof (RECT)); ZeroMemory(&r, sizeof (RECT));
r.left = LVIR_BOUNDS; r.left = LVIR_BOUNDS;
@ -207,8 +206,30 @@ static LRESULT onNM_CUSTOMDRAW(uiTable *t, NMLVCUSTOMDRAW *nm)
nm->clrTextBk = blend(nm->clrTextBk, r, g, b, a); nm->clrTextBk = blend(nm->clrTextBk, r, g, b, a);
} }
} }
{
LRESULT state;
HBRUSH b;
bool freeBrush = false;
// note: nm->nmcd.uItemState CDIS_SELECTED is unreliable for the listview configuration we have
state = SendMessageW(t->hwnd, LVM_GETITEMSTATE, nm->nmcd.dwItemSpec, LVIS_SELECTED);
if ((state & LVIS_SELECTED) != 0)
b = GetSysColorBrush(COLOR_HIGHLIGHT);
else if (nm->clrTextBk != CLR_DEFAULT) {
b = CreateSolidBrush(nm->clrTextBk);
if (b == NULL)
logLastError(L"CreateSolidBrush()");
freeBrush = true;
} else
b = GetSysColorBrush(COLOR_WINDOW);
// TODO check error
FillRect(nm->nmcd.hdc, &(nm->nmcd.rc), b);
if (freeBrush)
if (DeleteObject(b) == 0)
logLastError(L"DeleteObject()");
}
t->clrItemText = nm->clrText; t->clrItemText = nm->clrText;
ret = CDRF_NOTIFYSUBITEMDRAW; ret = CDRF_NEWFONT | CDRF_NOTIFYSUBITEMDRAW;
break; break;
case CDDS_SUBITEM | CDDS_ITEMPREPAINT: case CDDS_SUBITEM | CDDS_ITEMPREPAINT:
p = (*(t->columns))[nm->iSubItem]; p = (*(t->columns))[nm->iSubItem];