toItemContentRect() -> toCellContentRect() (consistency)
This commit is contained in:
parent
3cb96de162
commit
89fb2e8c6c
|
@ -149,7 +149,7 @@ static BOOL rowColumnToClientRect(struct table *t, struct rowcol rc, RECT *r)
|
||||||
|
|
||||||
// TODO idealCoordToRowColumn/rowColumnToIdealCoord?
|
// TODO idealCoordToRowColumn/rowColumnToIdealCoord?
|
||||||
|
|
||||||
static void toItemContentRect(struct table *t, RECT *r, LRESULT xoff, intptr_t width, intptr_t height)
|
static void toCellContentRect(struct table *t, RECT *r, LRESULT xoff, intptr_t width, intptr_t height)
|
||||||
{
|
{
|
||||||
if (xoff == 0)
|
if (xoff == 0)
|
||||||
xoff = SendMessageW(t->header, HDM_GETBITMAPMARGIN, 0, 0);
|
xoff = SendMessageW(t->header, HDM_GETBITMAPMARGIN, 0, 0);
|
||||||
|
@ -161,4 +161,4 @@ static void toItemContentRect(struct table *t, RECT *r, LRESULT xoff, intptr_t w
|
||||||
r->bottom = r->top + height;
|
r->bottom = r->top + height;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define toCheckboxRect(t, r) toItemContentRect(t, r, 0, t->checkboxWidth, t->checkboxHeight)
|
#define toCheckboxRect(t, r) toCellContentRect(t, r, 0, t->checkboxWidth, t->checkboxHeight)
|
||||||
|
|
|
@ -44,7 +44,7 @@ static void drawCell(struct table *t, HDC dc, struct drawCellParams *p)
|
||||||
switch (t->columnTypes[p->column]) {
|
switch (t->columnTypes[p->column]) {
|
||||||
case tableColumnText:
|
case tableColumnText:
|
||||||
case tableColumnImage: // TODO
|
case tableColumnImage: // TODO
|
||||||
toItemContentRect(t, &r, p->xoff, 0, 0); // TODO get the text height
|
toCellContentRect(t, &r, p->xoff, 0, 0); // TODO get the text height
|
||||||
if (SetTextColor(dc, GetSysColor(textColor)) == CLR_INVALID)
|
if (SetTextColor(dc, GetSysColor(textColor)) == CLR_INVALID)
|
||||||
panic("error setting Table cell text color");
|
panic("error setting Table cell text color");
|
||||||
if (SetBkMode(dc, TRANSPARENT) == 0)
|
if (SetBkMode(dc, TRANSPARENT) == 0)
|
||||||
|
|
Loading…
Reference in New Issue