I have no clue anymore. Tempted to undo checkbox stuff entirely for now.
This commit is contained in:
parent
94a3397894
commit
2a2990f19c
|
@ -163,6 +163,7 @@ static LRESULT onNM_CUSTOMDRAW(uiTable *t, NMLVCUSTOMDRAW *nm)
|
||||||
break;
|
break;
|
||||||
case CDDS_SUBITEM | CDDS_ITEMPREPAINT:
|
case CDDS_SUBITEM | CDDS_ITEMPREPAINT:
|
||||||
p = (*(t->columns))[nm->iSubItem];
|
p = (*(t->columns))[nm->iSubItem];
|
||||||
|
// TODO none of this runs on the first item
|
||||||
// we need this as previous subitems will persist their colors
|
// we need this as previous subitems will persist their colors
|
||||||
nm->clrText = t->clrItemText;
|
nm->clrText = t->clrItemText;
|
||||||
if (p->textParams.ColorModelColumn != -1) {
|
if (p->textParams.ColorModelColumn != -1) {
|
||||||
|
@ -173,6 +174,20 @@ static LRESULT onNM_CUSTOMDRAW(uiTable *t, NMLVCUSTOMDRAW *nm)
|
||||||
nm->clrText = blend(nm->clrTextBk, r, g, b, a);
|
nm->clrText = blend(nm->clrTextBk, r, g, b, a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (nm->iSubItem != 0) {
|
||||||
|
HWND header;
|
||||||
|
LRESULT margin;
|
||||||
|
header = (HWND) SendMessageW(t->hwnd, LVM_GETHEADER, NULL, NULL);
|
||||||
|
margin = SendMessageW(header, HDM_GETBITMAPMARGIN, 0, 0);
|
||||||
|
//nm->rcText.left -= margin;
|
||||||
|
printf("%d %d %d %d\n",
|
||||||
|
(int)(nm->nmcd.rc.left),
|
||||||
|
(int)(nm->nmcd.rc.top),
|
||||||
|
(int)(nm->nmcd.rc.right),
|
||||||
|
(int)(nm->nmcd.rc.bottom));
|
||||||
|
FillRect(nm->nmcd.hdc, &(nm->nmcd.rc), GetSysColorBrush(COLOR_ACTIVECAPTION));
|
||||||
|
return CDRF_SKIPDEFAULT;
|
||||||
|
}
|
||||||
// TODO draw background on image columns if needed
|
// TODO draw background on image columns if needed
|
||||||
ret = CDRF_NEWFONT;
|
ret = CDRF_NEWFONT;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -15,6 +15,8 @@ We'll use the small image list. For this, the first few items will be reserved f
|
||||||
|
|
||||||
// checkboxes TODOs:
|
// checkboxes TODOs:
|
||||||
// - see if we need to get rid of the extra margin in subitems
|
// - see if we need to get rid of the extra margin in subitems
|
||||||
|
// - get rid of the extra bitmap margin space before text
|
||||||
|
// - get rid of extra whitespace before text on subitems
|
||||||
|
|
||||||
#define nCheckboxImages 4
|
#define nCheckboxImages 4
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue