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

More work. List View is starting to show its dumbness again.

This commit is contained in:
Pietro Gagliardi 2018-06-09 13:57:43 -04:00
parent 1c9f9627c0
commit ff64685655
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
windows/table.cpp
View File

@ -37,6 +37,8 @@ struct uiTable {
int backgroundColumn; int backgroundColumn;
// custom draw state // custom draw state
HIMAGELIST dummyLarge;
HIMAGELIST dummySmall;
COLORREF clrItemText; COLORREF clrItemText;
}; };
@ -137,7 +139,7 @@ static LRESULT onLVN_GETDISPINFO(uiTable *t, NMLVDISPINFOW *nm)
if ((nm->item.mask & LVIF_IMAGE) != 0) if ((nm->item.mask & LVIF_IMAGE) != 0)
if (p->imageModelColumn != -1) if (p->imageModelColumn != -1)
nm->item.iImage = 1; nm->item.iImage = 0;
// we don't want to pop from an empty queue, so if nothing updated the queue (no info was filled in above), just push NULL // we don't want to pop from an empty queue, so if nothing updated the queue (no info was filled in above), just push NULL
if (!queueUpdated) if (!queueUpdated)
@ -152,7 +154,7 @@ static COLORREF blend(COLORREF base, double r, double g, double b, double a)
// TODO find a better fix than this // TODO find a better fix than this
// TODO s listview already alphablending? // TODO s listview already alphablending?
// TODO find the right color here // TODO find the right color here
if (base == 0xFF000000) if (base == CLR_DEFAULT)
base = GetSysColor(COLOR_WINDOW); base = GetSysColor(COLOR_WINDOW);
br = ((double) GetRValue(base)) / 255.0; br = ((double) GetRValue(base)) / 255.0;
bg = ((double) GetGValue(base)) / 255.0; bg = ((double) GetGValue(base)) / 255.0;
@ -199,6 +201,7 @@ 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);
} }
} }
// TODO draw background on image columns if needed
return CDRF_NEWFONT; return CDRF_NEWFONT;
} }
return CDRF_DODEFAULT; return CDRF_DODEFAULT;
@ -247,6 +250,7 @@ static void uiTableDestroy(uiControl *c)
for (auto col : *(t->columns)) for (auto col : *(t->columns))
uiprivFree(col); uiprivFree(col);
delete t->columns; delete t->columns;
// t->dummyLarge and t->dummySmall will be automatically destroyed
uiFreeControl(uiControl(t)); uiFreeControl(uiControl(t));
} }
@ -403,5 +407,23 @@ uiTable *uiNewTable(uiTableModel *model)
t->backgroundColumn = -1; t->backgroundColumn = -1;
// TODO update these when the DPI changes
t->dummyLarge = ImageList_Create(
GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON),
ILC_COLOR32,
1, 0);
if (t->dummyLarge == NULL)
logLastError(L"error calling ImageList_Create() for dummy large image list in uiNewTable()");
// TODO will this return NULL here because it's an initial state?
SendMessageW(t->hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM) (t->dummyLarge));
t->dummySmall = ImageList_Create(
GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
ILC_COLOR32,
1, 0);
if (t->dummySmall == NULL)
logLastError(L"error calling ImageList_Create() for dummy small image list in uiNewTable()");
// TODO will this return NULL here because it's an initial state?
SendMessageW(t->hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM) (t->dummySmall));
return t; return t;
} }