interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated windows/group.c. Also forgot a line in windows/tab.c.

This commit is contained in:
Pietro Gagliardi 2015-05-15 21:06:52 -04:00
parent ab4c534360
commit 8594646e45
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
windows/group.c → redo/windows/group.c
View File

@ -4,7 +4,7 @@
struct group { struct group {
uiGroup g; uiGroup g;
HWND hwnd; HWND hwnd;
uiBin *bin; uiControl *child;
void (*baseResize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *); void (*baseResize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *);
}; };
@ -22,8 +22,10 @@ static void onDestroy(void *data)
{ {
struct group *g = (struct group *) data; struct group *g = (struct group *) data;
uiBinRemoveOSParent(g->bin); if (g->child != NULL) {
uiControlDestroy(uiControl(g->bin)); uiControlSetParent(g->child, NULL);
uiControlDestroy(g->child);
}
uiFree(g); uiFree(g);
} }
@ -51,24 +53,36 @@ static void groupPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intma
static void groupResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) static void groupResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
{ {
struct group *g = (struct group *) c; struct group *g = (struct group *) c;
RECT r;
(*(g->baseResize))(uiControl(g), x, y, width, height, d); (*(g->baseResize))(uiControl(g), x, y, width, height, d);
if (g->child != NULL)
uiControlQueueResize(g->child);
}
static void groupComputeChildSize(uiControl *c, intmax_t *x, intmax_t *y, intmax_t *width, intmax_t *height, uiSizing *d)
{
struct group *g = (struct group *) c;
RECT r;
if (GetClientRect(g->hwnd, &r) == 0) if (GetClientRect(g->hwnd, &r) == 0)
logLastError("error getting uiGroup client rect for bin resize in groupResize()"); logLastError("error getting uiGroup client rect for bin resize in groupResize()");
r.left += uiWindowsDlgUnitsToX(groupUnmarginedXMargin, d->Sys->BaseX); r.left += uiWindowsDlgUnitsToX(groupUnmarginedXMargin, d->Sys->BaseX);
r.top += uiWindowsDlgUnitsToY(groupUnmarginedYMarginTop, d->Sys->BaseY); r.top += uiWindowsDlgUnitsToY(groupUnmarginedYMarginTop, d->Sys->BaseY);
r.right -= uiWindowsDlgUnitsToX(groupUnmarginedXMargin, d->Sys->BaseX); r.right -= uiWindowsDlgUnitsToX(groupUnmarginedXMargin, d->Sys->BaseX);
r.bottom -= uiWindowsDlgUnitsToY(groupUnmarginedYMarginBottom, d->Sys->BaseY); r.bottom -= uiWindowsDlgUnitsToY(groupUnmarginedYMarginBottom, d->Sys->BaseY);
uiBinResizeRootAndUpdate(g->bin, r.left, r.top, r.right - r.left, r.bottom - r.top); *x = r.left;
*y = r.top;
*width = r.right - r.left;
*height = r.bottom - r.top;
} }
static void groupSetChild(uiGroup *gg, uiControl *c) static void groupSetChild(uiGroup *gg, uiControl *c)
{ {
struct group *g = (struct group *) gg; struct group *g = (struct group *) gg;
uiBinSetMainControl(g->bin, c); g->child = c;
uiContainerUpdate(uiContainer(g->bin)); if (g->child != NULL)
uiControlQueueResize(g->child);
} }
uiGroup *uiNewGroup(const char *text) uiGroup *uiNewGroup(const char *text)
@ -85,6 +99,7 @@ uiGroup *uiNewGroup(const char *text)
p.lpWindowName = wtext; p.lpWindowName = wtext;
p.dwStyle = BS_GROUPBOX; p.dwStyle = BS_GROUPBOX;
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_COMMAND = onWM_COMMAND; p.onWM_COMMAND = onWM_COMMAND;
p.onWM_NOTIFY = onWM_NOTIFY; p.onWM_NOTIFY = onWM_NOTIFY;
@ -95,12 +110,10 @@ uiGroup *uiNewGroup(const char *text)
g->hwnd = (HWND) uiControlHandle(uiControl(g)); g->hwnd = (HWND) uiControlHandle(uiControl(g));
g->bin = newBin();
uiBinSetOSParent(g->bin, (uintptr_t) (g->hwnd));
uiControl(g)->PreferredSize = groupPreferredSize; uiControl(g)->PreferredSize = groupPreferredSize;
g->baseResize = uiControl(g)->Resize; g->baseResize = uiControl(g)->Resize;
uiControl(g)->Resize = groupResize; uiControl(g)->Resize = groupResize;
uiControl(g)->ComputeChildSize = groupComputeChildSize;
// TODO enable, disable, sysfunc // TODO enable, disable, sysfunc
uiGroup(g)->SetChild = groupSetChild; uiGroup(g)->SetChild = groupSetChild;

1
redo/windows/tab.c
View File

@ -334,6 +334,7 @@ uiTab *uiNewTab(void)
p.lpWindowName = L""; p.lpWindowName = L"";
p.dwStyle = TCS_TOOLTIPS | WS_TABSTOP; // start with this; we will alternate between this and WS_EX_CONTROLPARENT as needed (see main.c and msgHasTabStops above and the toggling functions below) p.dwStyle = TCS_TOOLTIPS | WS_TABSTOP; // start with this; we will alternate between this and WS_EX_CONTROLPARENT as needed (see main.c and msgHasTabStops above and the toggling functions below)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_COMMAND = onWM_COMMAND; p.onWM_COMMAND = onWM_COMMAND;
p.onWM_NOTIFY = onWM_NOTIFY; p.onWM_NOTIFY = onWM_NOTIFY;