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

Changed uiBox's controls array to an array of pointers. This is transitional; we move it to ptrArray next.

This commit is contained in:
Pietro Gagliardi 2015-05-07 22:36:32 -04:00
parent 27d6994bdc
commit e6e1d7ef6e
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
box.c
View File

@ -5,7 +5,7 @@
struct box { struct box {
uiBox b; uiBox b;
void (*baseDestroy)(uiControl *); void (*baseDestroy)(uiControl *);
struct boxControl *controls; struct boxControl **controls;
uintmax_t len; uintmax_t len;
uintmax_t cap; uintmax_t cap;
int vertical; int vertical;
@ -30,8 +30,8 @@ static void boxDestroy(uiControl *c)
complain("attempt to destroy uiBox %p while it has a parent", b); 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);
uiControlDestroy(b->controls[i].c); uiControlDestroy(b->controls[i]->c);
} }
uiFree(b->controls); uiFree(b->controls);
// NOW we can chain up to base // NOW we can chain up to base
@ -86,10 +86,10 @@ static void boxPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_
maxStretchyWidth = 0; maxStretchyWidth = 0;
maxStretchyHeight = 0; maxStretchyHeight = 0;
for (i = 0; i < b->len; i++) { for (i = 0; i < b->len; i++) {
if (!uiControlVisible(b->controls[i].c)) if (!uiControlVisible(b->controls[i]->c))
continue; continue;
uiControlPreferredSize(b->controls[i].c, d, &preferredWidth, &preferredHeight); uiControlPreferredSize(b->controls[i]->c, d, &preferredWidth, &preferredHeight);
if (b->controls[i].stretchy) { if (b->controls[i]->stretchy) {
nStretchy++; nStretchy++;
if (maxStretchyWidth < preferredWidth) if (maxStretchyWidth < preferredWidth)
maxStretchyWidth = preferredWidth; maxStretchyWidth = preferredWidth;
@ -99,10 +99,10 @@ static void boxPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_
if (b->vertical) { if (b->vertical) {
if (*width < preferredWidth) if (*width < preferredWidth)
*width = preferredWidth; *width = preferredWidth;
if (!b->controls[i].stretchy) if (!b->controls[i]->stretchy)
*height += preferredHeight; *height += preferredHeight;
} else { } else {
if (!b->controls[i].stretchy) if (!b->controls[i]->stretchy)
*width += preferredWidth; *width += preferredWidth;
if (*height < preferredHeight) if (*height < preferredHeight)
*height = preferredHeight; *height = preferredHeight;
@ -122,7 +122,7 @@ static void boxSysFunc(uiControl *c, uiControlSysFuncParams *p)
uintmax_t i; uintmax_t i;
for (i = 0; i < b->len; i++) for (i = 0; i < b->len; i++)
uiControlSysFunc(b->controls[i].c, p); uiControlSysFunc(b->controls[i]->c, p);
} }
static void boxResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) static void boxResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
@ -158,20 +158,20 @@ static void boxResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t w
stretchyht = height; stretchyht = height;
nStretchy = 0; nStretchy = 0;
for (i = 0; i < b->len; i++) { for (i = 0; i < b->len; i++) {
if (!uiControlVisible(b->controls[i].c)) if (!uiControlVisible(b->controls[i]->c))
continue; continue;
if (b->controls[i].stretchy) { if (b->controls[i]->stretchy) {
nStretchy++; nStretchy++;
continue; continue;
} }
uiControlPreferredSize(b->controls[i].c, d, &preferredWidth, &preferredHeight); uiControlPreferredSize(b->controls[i]->c, d, &preferredWidth, &preferredHeight);
if (b->vertical) { // all controls have same width if (b->vertical) { // all controls have same width
b->controls[i].width = width; b->controls[i]->width = width;
b->controls[i].height = preferredHeight; b->controls[i]->height = preferredHeight;
stretchyht -= preferredHeight; stretchyht -= preferredHeight;
} else { // all controls have same height } else { // all controls have same height
b->controls[i].width = preferredWidth; b->controls[i]->width = preferredWidth;
b->controls[i].height = height; b->controls[i]->height = height;
stretchywid -= preferredWidth; stretchywid -= preferredWidth;
} }
} }
@ -183,23 +183,23 @@ static void boxResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t w
else else
stretchywid /= nStretchy; stretchywid /= nStretchy;
for (i = 0; i < b->len; i++) { for (i = 0; i < b->len; i++) {
if (!uiControlVisible(b->controls[i].c)) if (!uiControlVisible(b->controls[i]->c))
continue; continue;
if (b->controls[i].stretchy) { if (b->controls[i]->stretchy) {
b->controls[i].width = stretchywid; b->controls[i]->width = stretchywid;
b->controls[i].height = stretchyht; b->controls[i]->height = stretchyht;
} }
} }
// 3) now we can position controls // 3) now we can position controls
for (i = 0; i < b->len; i++) { for (i = 0; i < b->len; i++) {
if (!uiControlVisible(b->controls[i].c)) if (!uiControlVisible(b->controls[i]->c))
continue; continue;
uiControlResize(b->controls[i].c, x, y, b->controls[i].width, b->controls[i].height, d); uiControlResize(b->controls[i]->c, x, y, b->controls[i]->width, b->controls[i]->height, d);
if (b->vertical) if (b->vertical)
y += b->controls[i].height + ypadding; y += b->controls[i]->height + ypadding;
else else
x += b->controls[i].width + xpadding; x += b->controls[i]->width + xpadding;
} }
} }
@ -208,15 +208,18 @@ static void boxResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t w
static void boxAppend(uiBox *ss, uiControl *c, int stretchy) static void boxAppend(uiBox *ss, uiControl *c, int stretchy)
{ {
struct box *b = (struct box *) ss; struct box *b = (struct box *) ss;
struct boxControl *bc;
if (b->len >= b->cap) { if (b->len >= b->cap) {
b->cap += boxCapGrow; b->cap += boxCapGrow;
b->controls = (struct boxControl *) uiRealloc(b->controls, b->cap * sizeof (struct boxControl)); b->controls = (struct boxControl **) uiRealloc(b->controls, b->cap * sizeof (struct boxControl *));
} }
b->controls[b->len].c = c; bc = uiNew(struct boxControl);
b->controls[b->len].stretchy = stretchy; b->controls[b->len] = bc;
b->controls[b->len]->c = c;
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
uiControlSetParent(b->controls[b->len - 1].c, uiContainer(b)); uiControlSetParent(b->controls[b->len - 1]->c, uiContainer(b));
uiContainerUpdate(uiContainer(b)); uiContainerUpdate(uiContainer(b));
} }
@ -226,7 +229,7 @@ static void boxDelete(uiBox *ss, uintmax_t index)
uiControl *removed; uiControl *removed;
uintmax_t i; uintmax_t i;
removed = b->controls[index].c; removed = b->controls[index]->c;
for (i = index; i < b->len - 1; i++) for (i = index; i < b->len - 1; i++)
b->controls[i] = b->controls[i + 1]; b->controls[i] = b->controls[i + 1];
b->len--; b->len--;