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

Partially fixed box updating issues by actually monitoring parent containers in uiBox.

This commit is contained in:
Pietro Gagliardi 2015-05-04 16:25:43 -04:00
parent b2e9b646a4
commit 1c62c04786
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
box.c
View File

@ -2,9 +2,6 @@
#include "ui.h" #include "ui.h"
#include "uipriv.h" #include "uipriv.h"
// TODOs
// - setting padded doesn't take effect immediately on Windows and OS X
struct box { struct box {
uiBox b; uiBox b;
void (*baseDestroy)(uiControl *); void (*baseDestroy)(uiControl *);
@ -12,7 +9,7 @@ struct box {
uintmax_t len; uintmax_t len;
uintmax_t cap; uintmax_t cap;
int vertical; int vertical;
int hasParent; void (*baseSetParent)(uiControl *, uiContainer *);
uiContainer *parent; uiContainer *parent;
int padded; int padded;
}; };
@ -29,7 +26,8 @@ static void boxDestroy(uiControl *c)
struct box *b = (struct box *) c; struct box *b = (struct box *) c;
uintmax_t i; uintmax_t i;
// TODO find a way to move the parented check here if (b->parent != NULL)
complain("attempt to destroy uiBox %p while it has a parent", b);
// don't chain up to base here; we need to destroy children ourselves first // don't chain up to base here; we need to destroy children ourselves first
for (i = 0; i < b->len; i++) { for (i = 0; i < b->len; i++) {
uiControlSetParent(b->controls[i].c, NULL); uiControlSetParent(b->controls[i].c, NULL);
@ -41,6 +39,16 @@ static void boxDestroy(uiControl *c)
uiFree(b); uiFree(b);
} }
static void boxSetParent(uiControl *c, uiContainer *parent)
{
struct box *b = (struct box *) c;
// this does all the actual work
(*(b->baseSetParent))(uiControl(b), parent);
// we just need to have a copy of the parent ourselves for boxSetPadded()
b->parent = parent;
}
static void boxPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height) static void boxPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
{ {
struct box *b = (struct box *) c; struct box *b = (struct box *) c;
@ -250,6 +258,8 @@ uiBox *uiNewHorizontalBox(void)
b->baseDestroy = uiControl(b)->Destroy; b->baseDestroy = uiControl(b)->Destroy;
uiControl(b)->Destroy = boxDestroy; uiControl(b)->Destroy = boxDestroy;
b->baseSetParent = uiControl(b)->SetParent;
uiControl(b)->SetParent = boxSetParent;
uiControl(b)->PreferredSize = boxPreferredSize; uiControl(b)->PreferredSize = boxPreferredSize;
uiControl(b)->SysFunc = boxSysFunc; uiControl(b)->SysFunc = boxSysFunc;