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

Changed box.c so that children are adde to the uiBox's uiContainer, not the parent's.

This commit is contained in:
Pietro Gagliardi 2015-04-26 23:12:38 -04:00
parent 54f16419ea
commit 1ab8684799
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
new/box.c
View File

@ -9,7 +9,6 @@ typedef struct boxControl boxControl;
struct box { struct box {
uiBox b; uiBox b;
void (*baseDestroy)(uiControl *); void (*baseDestroy)(uiControl *);
void (*baseSetParent)(uiControl *, uiContainer *);
void (*baseResize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *); void (*baseResize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *);
boxControl *controls; boxControl *controls;
uintmax_t len; uintmax_t len;
@ -41,23 +40,6 @@ static void boxDestroy(uiControl *c)
uiFree(b); uiFree(b);
} }
static void boxSetParent(uiControl *c, uiContainer *parent)
{
box *b = (box *) c;
uintmax_t i;
uiOSContainer *oldparent;
(*(b->baseSetParent))(c, parent);
oldparent = b->parent;
b->parent = parent;
for (i = 0; i < b->len; i++)
uiControlSetParent(b->controls[i].c, b->parent);
if (oldparent != NULL)
uiContainerUpdate(oldparent);
if (b->parent != NULL)
uiContainerUpdate(b->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)
{ {
box *b = (box *) c; box *b = (box *) c;
@ -217,10 +199,8 @@ static void boxAppend(uiBox *ss, uiControl *c, int stretchy)
b->controls[b->len].c = c; b->controls[b->len].c = c;
b->controls[b->len].stretchy = stretchy; b->controls[b->len].stretchy = stretchy;
b->len++; // must be here for OS container updates to work b->len++; // must be here for OS container updates to work
if (b->parent != NULL) { uiControlSetParent(b->controls[b->len - 1].c, uiContainer(b));
uiControlSetParent(b->controls[b->len - 1].c, b->parent); uiContainerUpdate(uiContainer(b));
uiContainerUpdate(b->parent);
}
} }
static void boxDelete(uiBox *ss, uintmax_t index) static void boxDelete(uiBox *ss, uintmax_t index)
@ -235,10 +215,8 @@ static void boxDelete(uiBox *ss, uintmax_t index)
b->controls[i] = b->controls[i + 1]; b->controls[i] = b->controls[i + 1];
// TODO memset the last one to NULL // TODO memset the last one to NULL
b->len--; b->len--;
if (b->parent != NULL) { uiControlSetParent(removed, NULL);
uiControlSetParent(removed, NULL); uiContainerUpdate(uiContainer(b));
uiContainerUpdate(b->parent);
}
} }
static int boxPadded(uiBox *ss) static int boxPadded(uiBox *ss)
@ -267,8 +245,6 @@ 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;
b->baseResize = uiControl(b)->Resize; b->baseResize = uiControl(b)->Resize;
uiControl(b)->Resize = boxResize; uiControl(b)->Resize = boxResize;