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

Migrated (and thus finished the adaptation of) box.c.

This commit is contained in:
Pietro Gagliardi 2015-05-30 17:33:37 -04:00
parent 90cc66fc93
commit 80646bd6cc
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
redo/box.c → redo/migrated/box.c
View File

@ -2,8 +2,6 @@
#include "out/ui.h" #include "out/ui.h"
#include "uipriv.h" #include "uipriv.h"
// TODO ContainerUpdateState()
struct box { struct box {
uiBox b; uiBox b;
void (*baseCommitDestroy)(uiControl *); void (*baseCommitDestroy)(uiControl *);
@ -205,8 +203,7 @@ static void boxResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intm
uiFreeSizing(dchild); uiFreeSizing(dchild);
} }
// TODO this doesn't really work the way we want for Z-orders static int boxHasTabStops(uiControl *c)
static void boxSysFunc(uiControl *c, uiControlSysFuncParams *p)
{ {
struct box *b = (struct box *) c; struct box *b = (struct box *) c;
struct boxControl *bc; struct boxControl *bc;
@ -214,7 +211,21 @@ static void boxSysFunc(uiControl *c, uiControlSysFuncParams *p)
for (i = 0; i < b->controls->len; i++) { for (i = 0; i < b->controls->len; i++) {
bc = ptrArrayIndex(b->controls, struct boxControl *, i); bc = ptrArrayIndex(b->controls, struct boxControl *, i);
uiControlSysFunc(bc->c, p); if (uiControlHasTabStops(bc->c))
return 1;
}
return 0;
}
static void boxContainerUpdateState(uiControl *c)
{
struct box *b = (struct box *) c;
struct boxControl *bc;
uintmax_t i;
for (i = 0; i < b->controls->len; i++) {
bc = ptrArrayIndex(b->controls, struct boxControl *, i);
uiControlUpdateState(bc->c);
} }
} }
@ -276,9 +287,10 @@ uiBox *uiNewHorizontalBox(void)
uiControl(b)->PreferredSize = boxPreferredSize; uiControl(b)->PreferredSize = boxPreferredSize;
b->baseResize = uiControl(b)->Resize; b->baseResize = uiControl(b)->Resize;
uiControl(b)->Resize = boxResize; uiControl(b)->Resize = boxResize;
uiControl(b)->SysFunc = boxSysFunc; uiControl(b)->HasTabStops = boxHasTabStops;
b->baseCommitDestroy = uiControl(b)->CommitDestroy; b->baseCommitDestroy = uiControl(b)->CommitDestroy;
uiControl(b)->CommitDestroy = boxCommitDestroy; uiControl(b)->CommitDestroy = boxCommitDestroy;
uiControl(b)->ContainerUpdateState = boxContainerUpdateState;
uiBox(b)->Append = boxAppend; uiBox(b)->Append = boxAppend;
uiBox(b)->Delete = boxDelete; uiBox(b)->Delete = boxDelete;