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

Decided to start with the parenting stuff now.

This commit is contained in:
Pietro Gagliardi 2015-04-07 00:23:01 -04:00
parent 35e1f8e14c
commit 06adf7488d
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
new/singlehandle_windows.c
View File

@ -4,30 +4,36 @@
// Common code for controls with a single window handle. // Common code for controls with a single window handle.
// The only method NOT defined is preferredSize(); this differs between controls. // The only method NOT defined is preferredSize(); this differs between controls.
#define S(c) ((uiSingleHWNDControl *) (c))
static uintptr_t singleHandle(uiControl *c) static uintptr_t singleHandle(uiControl *c)
{ {
return (uintptr_t) (c->hwnd); return (uintptr_t) (S(c)->hwnd);
} }
//TODO void (*setParent)(uiControl *, uintptr_t); void singleSetParent(uiControl *c, uintptr_t parentHWND)
{
if (SetParent(S(c)->hwnd, (HWND) parentHWND) == NULL)
logLastError("error changing control parent in singleSetParent()");
}
static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
{ {
if (MoveWindow(c->hwnd, x, y, width, height, TRUE) == 0) if (MoveWindow(S(c)->hwnd, x, y, width, height, TRUE) == 0)
logLastError("error moving control in singleResize()"); logLastError("error moving control in singleResize()");
} }
static void singleContainerShow(uiControl *c) static void singleContainerShow(uiControl *c)
{ {
ShowWindow(c->hwnd, SW_SHOW); ShowWindow(S(c)->hwnd, SW_SHOW);
} }
static void singleContainerHide(uiControl *c) static void singleContainerHide(uiControl *c)
{ {
ShowWindow(c->hwnd, SW_HIDE); ShowWindow(S(c)->hwnd, SW_HIDE);
} }
uiSingleHWNDControl *newSingleHWNDControl(DWORD exstyle, const WCHAR *class, DWORD style, HWND parent, HINSTANCE hInstance) uiSingleHWNDControl *newSingleHWNDControl(DWORD exstyle, const WCHAR *class, DWORD style, HINSTANCE hInstance)
{ {
uiSingleHWNDControl *c; uiSingleHWNDControl *c;
@ -38,12 +44,12 @@ uiSingleHWNDControl *newSingleHWNDControl(DWORD exstyle, const WCHAR *class, DWO
0, 0, 0, 0,
100, 100, 100, 100,
// TODO specify control IDs properly // TODO specify control IDs properly
parent, NULL, hInstance, NULL); initialParent, NULL, hInstance, NULL);
if (c->hwnd == NULL) if (c->hwnd == NULL)
logLastError("error creating control in newSingleHWNDControl()"); logLastError("error creating control in newSingleHWNDControl()");
c->control.handle = singleHandle; c->control.handle = singleHandle;
//TODO c->control.setParent = singleSetParent; c->control.setParent = singleSetParent;
c->control.resize = singleResize; c->control.resize = singleResize;
c->control.containerShow = singleContainerShow; c->control.containerShow = singleContainerShow;
c->control.containerHide = singleContainerHide; c->control.containerHide = singleContainerHide;

3
new/ui_windows.h
View File

@ -47,6 +47,7 @@ extern HRESULT logMemoryExhausted(const char *);
extern HINSTANCE hInstance; extern HINSTANCE hInstance;
extern int nCmdShow; extern int nCmdShow;
extern HFONT hMessageFont; extern HFONT hMessageFont;
extern HWND initialParent;
// util_windows.c // util_windows.c
extern WCHAR *toUTF16(const char *); extern WCHAR *toUTF16(const char *);
@ -62,6 +63,6 @@ struct uiSingleHWNDControl {
void (*voidEvent)(uiControl *, void *); void (*voidEvent)(uiControl *, void *);
void *voidEventData; void *voidEventData;
}; };
extern uiSingleHWNDControl *newSingleHWNDControl(DWORD, const WCHAR *, DWORD, HWND, HINSTANCE); extern uiSingleHWNDControl *newSingleHWNDControl(DWORD, const WCHAR *, DWORD, HINSTANCE);
#endif #endif

2
new/uipriv.h
View File

@ -12,7 +12,7 @@ struct uiSize {
// TODO handle destruction // TODO handle destruction
struct uiControl { struct uiControl {
uintptr_t (*handle)(uiControl *); uintptr_t (*handle)(uiControl *);
//TODO void (*setParent)(uiControl *, uintptr_t); void (*setParent)(uiControl *, uintptr_t);
uiSize (*preferredSize)(uiControl *, uiSizing *); uiSize (*preferredSize)(uiControl *, uiSizing *);
void (*resize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *); void (*resize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *);
void (*containerShow)(uiControl *); void (*containerShow)(uiControl *);