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

Started splitting message handlers for the new Windows Table into their respective files.

This commit is contained in:
Pietro Gagliardi 2014-11-30 21:27:32 -05:00
parent c41b9b16ff
commit 84d66b6b50
2 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wintable/api.h
View File

@ -23,3 +23,32 @@ static void addColumn(struct table *t, WPARAM wParam, LPARAM lParam)
// TODO resize(t)? // TODO resize(t)?
redrawAll(t); redrawAll(t);
} }
HANDLER(API)
{
switch (uMsg) {
case WM_SETFONT:
t->font = (HFONT) wParam;
if (t->font == NULL)
t->font = t->defaultFont;
// also set the header font
SendMessageW(t->header, WM_SETFONT, wParam, lParam);
if (LOWORD(lParam) != FALSE) {
// the scrollbar page size will change so redraw that too
// also recalculate the header height
// TODO do that when this is FALSE too somehow
resize(t);
redrawAll(t);
}
*lResult = 0;
return TRUE;
case WM_GETFONT:
*lResult = (LRESULT) t->font;
return TRUE;
case tableAddColumn:
addColumn(t, wParam, lParam);
*lResult = 0;
return TRUE;
}
return FALSE;
}

32
wintable/main.c
View File

@ -93,6 +93,7 @@ struct table {
int checkboxHeight; int checkboxHeight;
}; };
#define HANDLER(what) static BOOL what ## Handler(struct table *t, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *lResult)
#include "util.h" #include "util.h"
#include "hscroll.h" #include "hscroll.h"
#include "vscroll.h" #include "vscroll.h"
@ -100,10 +101,19 @@ struct table {
#include "draw.h" #include "draw.h"
#include "api.h" #include "api.h"
typedef BOOL (*handlerfunc)(struct table *, UINT, WPARAM, LPARAM, LRESULT *);
handlerfunc handlerfuncs[] = {
APIHandler,
NULL,
};
// TODO create a system where each of the above modules provide their own window procedures // TODO create a system where each of the above modules provide their own window procedures
static LRESULT CALLBACK tableWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK tableWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
struct table *t; struct table *t;
handlerfunc *hf;
LRESULT lResult;
HDC dc; HDC dc;
PAINTSTRUCT ps; PAINTSTRUCT ps;
NMHDR *nmhdr = (NMHDR *) lParam; NMHDR *nmhdr = (NMHDR *) lParam;
@ -154,6 +164,9 @@ if (ImageList_GetIconSize(t->imagelist, &unused, &(t->imagelistHeight)) == 0)abo
// even if we did the above, fall through // even if we did the above, fall through
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
} }
for (hf = handlerfuncs; *hf != NULL; hf++)
if ((*hf)(t, uMsg, wParam, lParam, &lResult))
return lResult;
switch (uMsg) { switch (uMsg) {
case WM_PAINT: case WM_PAINT:
dc = BeginPaint(hwnd, &ps); dc = BeginPaint(hwnd, &ps);
@ -162,22 +175,6 @@ if (ImageList_GetIconSize(t->imagelist, &unused, &(t->imagelistHeight)) == 0)abo
drawItems(t, dc, ps.rcPaint); drawItems(t, dc, ps.rcPaint);
EndPaint(hwnd, &ps); EndPaint(hwnd, &ps);
return 0; return 0;
case WM_SETFONT:
t->font = (HFONT) wParam;
if (t->font == NULL)
t->font = t->defaultFont;
// also set the header font
SendMessageW(t->header, WM_SETFONT, wParam, lParam);
if (LOWORD(lParam) != FALSE) {
// the scrollbar page size will change so redraw that too
// also recalculate the header height
// TODO do that when this is FALSE too somehow
resize(t);
redrawAll(t);
}
return 0;
case WM_GETFONT:
return (LRESULT) t->font;
case WM_VSCROLL: case WM_VSCROLL:
vscroll(t, wParam); vscroll(t, wParam);
return 0; return 0;
@ -226,9 +223,6 @@ if (ImageList_GetIconSize(t->imagelist, &unused, &(t->imagelistHeight)) == 0)abo
// now defer back to DefWindowProc() in case other things are needed // now defer back to DefWindowProc() in case other things are needed
// TODO needed? // TODO needed?
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
case tableAddColumn:
addColumn(t, wParam, lParam);
return 0;
case WM_GETOBJECT: // accessibility case WM_GETOBJECT: // accessibility
/* /*
if (((DWORD) lParam) == OBJID_CLIENT) { if (((DWORD) lParam) == OBJID_CLIENT) {