Implemented image cells.
This commit is contained in:
parent
ff4212913a
commit
7c473a9fdc
|
@ -20,6 +20,9 @@ static void drawCell(struct table *t, HDC dc, struct drawCellParams *p)
|
||||||
POINT pt;
|
POINT pt;
|
||||||
int cbState;
|
int cbState;
|
||||||
RECT cellrect;
|
RECT cellrect;
|
||||||
|
HDC idc;
|
||||||
|
HBITMAP previbitmap;
|
||||||
|
BLENDFUNCTION bf;
|
||||||
|
|
||||||
// TODO verify these two
|
// TODO verify these two
|
||||||
background = (HBRUSH) (COLOR_WINDOW + 1);
|
background = (HBRUSH) (COLOR_WINDOW + 1);
|
||||||
|
@ -46,7 +49,6 @@ 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
|
|
||||||
toCellContentRect(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");
|
||||||
|
@ -56,6 +58,28 @@ static void drawCell(struct table *t, HDC dc, struct drawCellParams *p)
|
||||||
if (DrawTextExW(dc, msg, n, &r, DT_END_ELLIPSIS | DT_LEFT | DT_NOPREFIX | DT_SINGLELINE, NULL) == 0)
|
if (DrawTextExW(dc, msg, n, &r, DT_END_ELLIPSIS | DT_LEFT | DT_NOPREFIX | DT_SINGLELINE, NULL) == 0)
|
||||||
panic("error drawing Table cell text");
|
panic("error drawing Table cell text");
|
||||||
break;
|
break;
|
||||||
|
case tableColumnImage:
|
||||||
|
toCellContentRect(t, &r, p->xoff, tableImageWidth(), tableImageHeight());
|
||||||
|
idc = CreateCompatibleDC(dc);
|
||||||
|
if (idc == NULL)
|
||||||
|
panic("error creating compatible DC for Table image cell drawing");
|
||||||
|
previbitmap = SelectObject(idc, testbitmap);
|
||||||
|
if (previbitmap == NULL)
|
||||||
|
panic("error selecting Table cell image into compatible DC for image drawing");
|
||||||
|
ZeroMemory(&bf, sizeof (BLENDFUNCTION));
|
||||||
|
bf.BlendOp = AC_SRC_OVER;
|
||||||
|
bf.BlendFlags = 0;
|
||||||
|
bf.SourceConstantAlpha = 255; // per-pixel alpha values
|
||||||
|
bf.AlphaFormat = AC_SRC_ALPHA;
|
||||||
|
// TODO 16 and 16 are the width and height of the image; we would need to get that out somehow
|
||||||
|
if (AlphaBlend(dc, r.left, r.top, r.right - r.left, r.bottom - r.top,
|
||||||
|
idc, 0, 0, 16, 16, bf) == FALSE)
|
||||||
|
panic("error drawing image into Table cell");
|
||||||
|
if (SelectObject(idc, previbitmap) != testbitmap)
|
||||||
|
panic("error deselecting Table cell image for drawing image");
|
||||||
|
if (DeleteDC(idc) == 0)
|
||||||
|
panic("error deleting Table compatible DC for image cell drawing");
|
||||||
|
break;
|
||||||
case tableColumnCheckbox:
|
case tableColumnCheckbox:
|
||||||
toCheckboxRect(t, &r, p->xoff);
|
toCheckboxRect(t, &r, p->xoff);
|
||||||
cbState = 0;
|
cbState = 0;
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
// 19 october 2014
|
// 19 october 2014
|
||||||
#include "../wininclude_windows.h"
|
#include "../wininclude_windows.h"
|
||||||
|
|
||||||
// #qo LIBS: user32 kernel32 gdi32 comctl32 uxtheme ole32 oleaut32 oleacc uuid
|
// #qo LIBS: user32 kernel32 gdi32 comctl32 uxtheme ole32 oleaut32 oleacc uuid msimg32
|
||||||
|
|
||||||
|
HBITMAP testbitmap;
|
||||||
|
void mkbitmap(void);
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
|
||||||
|
@ -11,6 +14,7 @@ int main(int argc, char *argv[])
|
||||||
MSG msg;
|
MSG msg;
|
||||||
INITCOMMONCONTROLSEX icc;
|
INITCOMMONCONTROLSEX icc;
|
||||||
|
|
||||||
|
mkbitmap();
|
||||||
ZeroMemory(&icc, sizeof (INITCOMMONCONTROLSEX));
|
ZeroMemory(&icc, sizeof (INITCOMMONCONTROLSEX));
|
||||||
icc.dwSize = sizeof (INITCOMMONCONTROLSEX);
|
icc.dwSize = sizeof (INITCOMMONCONTROLSEX);
|
||||||
icc.dwICC = ICC_LISTVIEW_CLASSES;
|
icc.dwICC = ICC_LISTVIEW_CLASSES;
|
||||||
|
@ -50,3 +54,42 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// from tango-icon-theme-0.8.90/16x16/status/audio-volume-high.png (public domain)
|
||||||
|
COLORREF iconpix[] = {
|
||||||
|
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1003060A, 0x0, 0x0, 0x0,
|
||||||
|
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x34101210, 0x5020202, 0x0, 0x0, 0x0, 0x0, 0x9E203E66, 0x78182F4D, 0x0, 0x0,
|
||||||
|
0x0, 0x0, 0x0, 0x0, 0x0, 0x32111110, 0xF051534F, 0x8030303, 0x0, 0x0, 0x0, 0x0, 0x1C050B12, 0xE92F5C96, 0x2B08111B, 0x0,
|
||||||
|
0x0, 0x0, 0x0, 0x0, 0x32111110, 0xF1575855, 0xFE545652, 0x8030303, 0x0, 0x0, 0x67152942, 0x440E1B2C, 0x0, 0x6214263F, 0xCB295083, 0x4000102,
|
||||||
|
0xF3525450, 0xFB545653, 0xF0555653, 0x8830302E, 0xF1575855, 0xFFBEBFBC, 0xFC565854, 0x8030303, 0x0, 0x0, 0x420C192A, 0xE12E5991, 0xF03060A, 0x0, 0xC6284E7F, 0x52102034,
|
||||||
|
0xFB555653, 0xFFE5E5E3, 0xFFD1D2CF, 0xFE585A56, 0xFFC7C8C5, 0xFFF7F7F6, 0xFC5A5C58, 0x8030303, 0x68142943, 0x1C060B12, 0x0, 0x9A1E3D63, 0x81193353, 0x0, 0x831A3454, 0x891C3658,
|
||||||
|
0xFB545653, 0xFFFAFAF9, 0xFFFAFAFA, 0xFF585A56, 0xFFF8F8F8, 0xFFFFFFFF, 0xFC5B5D59, 0x8030303, 0x7B19314F, 0xAB23436E, 0x0, 0x4A0F1D30, 0xBA264978, 0x0, 0x4F101F33, 0xBD264B7A,
|
||||||
|
0xFB545653, 0xFFCFD0CD, 0xFFD3D4D1, 0xFF585A56, 0xFFD2D2D0, 0xFFD7D7D5, 0xFC565854, 0x8030303, 0x1C060B12, 0xEF305F9A, 0x1000001, 0x19050A10, 0xEF305F9A, 0x1000001, 0x1B050A11, 0xF0315F9A,
|
||||||
|
0xFB545653, 0xFFC2C3C0, 0xFFC6C7C4, 0xFF585A56, 0xFFCDCECB, 0xFFD1D2CF, 0xFC565854, 0x8030303, 0x19050A10, 0xF231609C, 0x1000001, 0x1603090E, 0xF1315F9B, 0x1000001, 0x1804090F, 0xF231609C,
|
||||||
|
0xFB545653, 0xFFB5B7B3, 0xFFB9BBB7, 0xFF575955, 0xFFC8C8C6, 0xFFCCCCCA, 0xFC565854, 0x8030303, 0x71172D49, 0xB2244772, 0x0, 0x470D1C2E, 0xBE264B7A, 0x0, 0x4C0F1E31, 0xC0274C7B,
|
||||||
|
0xFB545653, 0xFFA9ABA7, 0xFFA0A29E, 0xFF575955, 0xFFA9ABA8, 0xFFC6C7C4, 0xFC565854, 0x8030303, 0x75172E4B, 0x23070E17, 0x0, 0x921D3A5E, 0x861A3556, 0x0, 0x801A3252, 0x8C1C375A,
|
||||||
|
0xFA535551, 0xFC555753, 0xF7545652, 0x98353534, 0xF3565854, 0xFFA8A8A6, 0xFC565854, 0x8030303, 0x0, 0x0, 0x390C1725, 0xE62F5B94, 0x1404080D, 0x0, 0xC0274C7B, 0x57112238,
|
||||||
|
0x7020202, 0x8020202, 0x3010100, 0x0, 0x3C141414, 0xF3565854, 0xFE545652, 0x8030303, 0x0, 0x0, 0x70162C48, 0x4E0F1F32, 0x0, 0x57112238, 0xD32B5388, 0x6010203,
|
||||||
|
0x0, 0x0, 0x0, 0x0, 0x0, 0x3C141414, 0xF5515350, 0x8030303, 0x0, 0x0, 0x0, 0x0, 0x1604080E, 0xE72F5B95, 0x330A1420, 0x0,
|
||||||
|
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3F151515, 0x5020202, 0x0, 0x0, 0x0, 0x0, 0x991F3C62, 0x831A3454, 0x0, 0x0,
|
||||||
|
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1B050A11, 0x4000102, 0x0, 0x0,
|
||||||
|
};
|
||||||
|
|
||||||
|
void mkbitmap(void)
|
||||||
|
{
|
||||||
|
BITMAPINFO bi;
|
||||||
|
void *ppvBits;
|
||||||
|
|
||||||
|
ZeroMemory(&bi, sizeof (BITMAPINFO));
|
||||||
|
bi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER);
|
||||||
|
bi.bmiHeader.biWidth = 16;
|
||||||
|
bi.bmiHeader.biHeight = -16; // negative height to force top-down drawing
|
||||||
|
bi.bmiHeader.biPlanes = 1;
|
||||||
|
bi.bmiHeader.biBitCount = 32;
|
||||||
|
bi.bmiHeader.biCompression = BI_RGB;
|
||||||
|
bi.bmiHeader.biSizeImage = 16 * 16 * 4;
|
||||||
|
testbitmap = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, &ppvBits, 0, 0);
|
||||||
|
if (testbitmap == 0)
|
||||||
|
panic("test bitmap creation failed");
|
||||||
|
memcpy(ppvBits, iconpix, bi.bmiHeader.biSizeImage);
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue