interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New checkbox plan: because DrawThemeBackground() /might/ do AlphaBlend(), we'll just draw checkboxes on the fly.

This commit is contained in:
Pietro Gagliardi 2014-12-18 19:24:32 -05:00
parent 07c599ad1b
commit d7cf4fa7c5
2 changed files with 40 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
wintable/new/checkboximages.h
View File

@ -1,6 +1,11 @@
// 16 august 2014 // 16 august 2014
// TODO instead of caching checkbox images, draw them on the fly, because they could be transparent enum {
checkboxStateChecked = 1 << 0,
checkboxStateHot = 1 << 1,
checkboxStatePushed = 1 << 2,
checkboxnStates = 1 << 3,
};
// TODO actually make this // TODO actually make this
#define panichresult(a, b) panic(a) #define panichresult(a, b) panic(a)
@ -19,13 +24,13 @@ static UINT dfcState(int cbstate)
return ret; return ret;
} }
static void dfcImage(HDC dc, RECT *r, int cbState, HTHEME theme) static void drawFrameControlCheckbox(HDC dc, RECT *r, int cbState)
{ {
if (DrawFrameControl(dc, r, DFC_BUTTON, dfcState(cbState)) == 0) if (DrawFrameControl(dc, r, DFC_BUTTON, dfcState(cbState)) == 0)
panic("error drawing Table checkbox image with DrawFrameControl()"); panic("error drawing Table checkbox image with DrawFrameControl()");
} }
static void dfcSize(HDC dc, int *width, int *height, HTHEME theme) static void getFrameControlCheckboxSize(HDC dc, int *width, int *height, HTHEME theme)
{ {
// there's no real metric around // there's no real metric around
// let's use SM_CX/YSMICON and hope for the best // let's use SM_CX/YSMICON and hope for the best
@ -55,7 +60,7 @@ static SIZE getStateSize(HDC dc, int cbState, HTHEME theme)
return s; return s;
} }
static void themeImage(HDC dc, RECT *r, int cbState, HTHEME theme) static void drawThemeCheckbox(HDC dc, RECT *r, int cbState, HTHEME theme)
{ {
HRESULT res; HRESULT res;
@ -64,7 +69,7 @@ static void themeImage(HDC dc, RECT *r, int cbState, HTHEME theme)
panichresult("error drawing Table checkbox image from theme", res); panichresult("error drawing Table checkbox image from theme", res);
} }
static void themeSize(HDC dc, int *width, int *height, HTHEME theme) static void getThemeCheckboxSize(HDC dc, int *width, int *height, HTHEME theme)
{ {
SIZE size; SIZE size;
int cbState; int cbState;
@ -82,87 +87,48 @@ static void themeSize(HDC dc, int *width, int *height, HTHEME theme)
*height = (int) size.cy; *height = (int) size.cy;
} }
static void makeCheckboxImage(struct table *t, HDC dc, int cbState, void (*drawfunc)(HDC, RECT *, int, HTHEME)) static void drawCheckbox(struct table *t, HDC dc, int x, int y, int cbState)
{ {
BITMAPINFO bi;
VOID *ppvBits;
HBITMAP bitmap;
RECT r; RECT r;
HDC drawDC;
HBITMAP prevbitmap;
r.left = 0; r.left = x;
r.top = 0; r.top = y;
r.right = t->checkboxWidth; r.right = r.bottom + t->checkboxWidth;
r.bottom = t->checkboxHeight; r.bottom = r.top + t->checkboxHeight;
ZeroMemory(&bi, sizeof (BITMAPINFO)); if (t->theme != NULL) {
bi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER); drawThemeCheckbox(dc, &r, cbState, t->theme);
bi.bmiHeader.biWidth = (LONG) (t->checkboxWidth); return;
bi.bmiHeader.biHeight = -((LONG) (t->checkboxHeight)); // negative height to force top-down drawing; }
bi.bmiHeader.biPlanes = 1; drawFrameControlCheckbox(dc, &r, cbState);
bi.bmiHeader.biBitCount = 32;
bi.bmiHeader.biCompression = BI_RGB;
bi.bmiHeader.biSizeImage = (DWORD) (t->checkboxWidth * t->checkboxHeight * 4);
bitmap = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, &ppvBits, 0, 0);
if (bitmap == NULL)
panic("error creating HBITMAP for Table checkbox image");
drawDC = CreateCompatibleDC(dc);
if (drawDC == NULL)
panic("error getting DC for drawing Table checkbox image");
prevbitmap = SelectObject(drawDC, bitmap);
if (prevbitmap == NULL)
panic("error selecting Table checkbox image list bitmap into DC");
(*drawfunc)(drawDC, &r, cbState, t->theme);
if (SelectObject(drawDC, prevbitmap) != bitmap)
panic("error selecting previous bitmap into Table checkbox image's DC");
if (DeleteDC(drawDC) == 0)
panic("error deleting Table checkbox image's DC");
t->checkboxImages[cbState] = bitmap;
} }
static void getCheckboxImages(struct table *t, void (*sizefunc)(HDC, int *, int *, HTHEME), void (*drawfunc)(HDC, RECT *, int, HTHEME)) static void freeCheckboxThemeData(struct table *t)
{
int cbState;
HDC dc;
dc = GetDC(t->hwnd);
if (dc == NULL)
panic("error getting DC for making Table checkbox images");
(*sizefunc)(dc, &(t->checkboxWidth), &(t->checkboxHeight), t->theme);
for (cbState = 0; cbState < checkboxnStates; cbState++)
makeCheckboxImage(t, dc, cbState, drawfunc);
if (ReleaseDC(t->hwnd, dc) == 0)
panic("error deleting Table DC for making checkbox images");
}
static void makeCheckboxImages(struct table *t)
{ {
if (t->theme != NULL) { if (t->theme != NULL) {
HRESULT res; HRESULT res;
res = CloseThemeData(t->theme); res = CloseThemeData(t->theme);
if (res != S_OK) if (res != S_OK)
panichresult("error closing theme", res); panichresult("error closing Table checkbox theme", res);
t->theme = NULL; t->theme = NULL;
} }
}
static void loadCheckboxThemeData(struct table *t)
{
HDC dc;
freeCheckboxThemeData(t);
dc = GetDC(t->hwnd);
if (dc == NULL)
panic("error getting Table DC for loading checkbox theme data");
// ignore error; if it can't be done, we can fall back to DrawFrameControl() // ignore error; if it can't be done, we can fall back to DrawFrameControl()
if (t->theme == NULL) // try to open the theme if (t->theme == NULL) // try to open the theme
t->theme = OpenThemeData(t->hwnd, L"button"); t->theme = OpenThemeData(t->hwnd, L"button");
if (t->theme != NULL) { // use the theme if (t->theme != NULL) // use the theme
getCheckboxImages(t, themeSize, themeImage); getThemeCheckboxSize(dc, &(t->checkboxWidth), &(t->checkboxHeight), t->theme);
return; else // couldn't open; fall back
} getFrameControlCheckboxSize(dc, &(t->checkboxWidth), &(t->checkboxHeight), t->theme);
// couldn't open; fall back if (ReleaseDC(t->hwnd, dc) == 0)
getCheckboxImages(t, dfcSize, dfcImage); panic("error releasing Table DC for loading checkbox theme data");
}
static void freeCheckboxImages(struct table *t)
{
int cbState;
for (cbState = 0; cbState < checkboxnStates; cbState++)
if (DeleteObject(t->checkboxImages[cbState]) == 0)
panic("error freeing Table checkbox image");
} }

12
wintable/new/main.c
View File

@ -50,13 +50,6 @@ static void (*tablePanic)(const char *, DWORD) = NULL;
#define panic(...) (*tablePanic)(__VA_ARGS__, GetLastError()) #define panic(...) (*tablePanic)(__VA_ARGS__, GetLastError())
#define abort $$$$ // prevent accidental use of abort() #define abort $$$$ // prevent accidental use of abort()
enum {
checkboxStateChecked = 1 << 0,
checkboxStateHot = 1 << 1,
checkboxStatePushed = 1 << 2,
checkboxnStates = 1 << 3,
};
struct table { struct table {
HWND hwnd; HWND hwnd;
HWND header; HWND header;
@ -75,7 +68,6 @@ struct table {
intptr_t selectedRow; intptr_t selectedRow;
intptr_t selectedColumn; intptr_t selectedColumn;
HTHEME theme; HTHEME theme;
HBITMAP checkboxImages[checkboxnStates];
int checkboxWidth; int checkboxWidth;
int checkboxHeight; int checkboxHeight;
}; };
@ -130,7 +122,7 @@ static LRESULT CALLBACK tableWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
makeHeader(t, cs->hInstance); makeHeader(t, cs->hInstance);
t->selectedRow = -1; t->selectedRow = -1;
t->selectedColumn = -1; t->selectedColumn = -1;
makeCheckboxImages(t); loadCheckboxThemeData(t);
initDummyTableStuff(t); initDummyTableStuff(t);
SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR) t); SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR) t);
} }
@ -141,7 +133,7 @@ initDummyTableStuff(t);
printf("destroy\n"); printf("destroy\n");
// TODO free appropriate (after figuring this part out) components of t // TODO free appropriate (after figuring this part out) components of t
// TODO send EVENT_OBJECT_DESTROY events to accessibility listeners (when appropriate); see the note on proxy objects as well // TODO send EVENT_OBJECT_DESTROY events to accessibility listeners (when appropriate); see the note on proxy objects as well
freeCheckboxImages(t); freeCheckboxThemeData(t);
destroyHeader(t); destroyHeader(t);
tableFree(t, "error allocating internal Table data structure"); tableFree(t, "error allocating internal Table data structure");
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);