From 0430ca9102b54fd9127d8b998d45f1941c1a278a Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 11 Apr 2015 14:30:07 -0400 Subject: Implemented making invisible children of uiStacks not count when drawing or calculating preferred size. Need to implement the new methods on uiStack itself before we can test. --- new/stack.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'new/stack.c') diff --git a/new/stack.c b/new/stack.c index 4c817d2..3899f83 100644 --- a/new/stack.c +++ b/new/stack.c @@ -97,6 +97,8 @@ static void stackPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intma maxStretchyWidth = 0; maxStretchyHeight = 0; for (i = 0; i < s->len; i++) { + if (!uiControlVisible(s->controls[i].c)) + continue; uiControlPreferredSize(s->controls[i].c, d, &preferredWidth, &preferredHeight); if (s->controls[i].stretchy) { nStretchy++; @@ -157,6 +159,8 @@ static void stackResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, in stretchyht = height; nStretchy = 0; for (i = 0; i < s->len; i++) { + if (!uiControlVisible(s->controls[i].c)) + continue; if (s->controls[i].stretchy) { nStretchy++; continue; @@ -180,14 +184,19 @@ static void stackResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, in stretchyht /= nStretchy; else stretchywid /= nStretchy; - for (i = 0; i < s->len; i++) + for (i = 0; i < s->len; i++) { + if (!uiControlVisible(s->controls[i].c)) + continue; if (s->controls[i].stretchy) { s->controls[i].width = stretchywid; s->controls[i].height = stretchyht; } + } // 3) now we can position controls for (i = 0; i < s->len; i++) { + if (!uiControlVisible(s->controls[i].c)) + continue; uiControlResize(s->controls[i].c, x, y, s->controls[i].width, s->controls[i].height, d); if (s->vertical) y += s->controls[i].height + ypadding; -- cgit v1.2.3