From 34d3771f77f8f6d695e0e0ff4bcf3d80695f461d Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 19 Dec 2014 20:48:02 -0500 Subject: [PATCH] Added code for distinguishing column types to drawCell(). --- wintable/new/draw.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/wintable/new/draw.h b/wintable/new/draw.h index 626f23f..3d20383 100644 --- a/wintable/new/draw.h +++ b/wintable/new/draw.h @@ -45,13 +45,17 @@ static void drawCell(struct table *t, HDC dc, struct drawCellParams *p) r.left += p->xoff; // TODO vertical center content too - if (SetTextColor(dc, GetSysColor(textColor)) == CLR_INVALID) - panic("error setting Table cell text color"); - if (SetBkMode(dc, TRANSPARENT) == 0) - panic("error setting transparent text drawing mode for Table cell"); - n = wsprintf(msg, L"(%d,%d)", p->row, p->column); - if (DrawTextExW(dc, msg, n, &r, DT_END_ELLIPSIS | DT_LEFT | DT_NOPREFIX | DT_SINGLELINE, NULL) == 0) - panic("error drawing Table cell text"); + switch (t->columnTypes[p->column]) { + case tableColumnText: + case tableColumnImage: // TODO + if (SetTextColor(dc, GetSysColor(textColor)) == CLR_INVALID) + panic("error setting Table cell text color"); + if (SetBkMode(dc, TRANSPARENT) == 0) + panic("error setting transparent text drawing mode for Table cell"); + n = wsprintf(msg, L"(%d,%d)", p->row, p->column); + if (DrawTextExW(dc, msg, n, &r, DT_END_ELLIPSIS | DT_LEFT | DT_NOPREFIX | DT_SINGLELINE, NULL) == 0) + panic("error drawing Table cell text"); + } } static void draw(struct table *t, HDC dc, RECT cliprect, RECT client)