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

Fixed uiBox hidden control nonsense on Windows. FINALLY.

This commit is contained in:
Pietro Gagliardi 2016-06-14 16:06:39 -04:00
parent 997c8aac35
commit b6cb429d1a
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
windows/box.cpp
View File

@ -37,6 +37,7 @@ static void boxRelayout(uiBox *b)
int stretchywid, stretchyht; int stretchywid, stretchyht;
int i; int i;
int minimumWidth, minimumHeight; int minimumWidth, minimumHeight;
int nVisible;
uiWindowsSizing *d; uiWindowsSizing *d;
if (b->controls->size() == 0) if (b->controls->size() == 0)
@ -51,21 +52,16 @@ static void boxRelayout(uiBox *b)
// -1) get this Box's padding // -1) get this Box's padding
boxPadding(b, &xpadding, &ypadding); boxPadding(b, &xpadding, &ypadding);
// 0) inset the available rect by the needed padding
// TODO this is incorrect if any controls are hidden
if (b->vertical)
height -= (b->controls->size() - 1) * ypadding;
else
width -= (b->controls->size() - 1) * xpadding;
// 1) get width and height of non-stretchy controls // 1) get width and height of non-stretchy controls
// this will tell us how much space will be left for stretchy controls // this will tell us how much space will be left for stretchy controls
stretchywid = width; stretchywid = width;
stretchyht = height; stretchyht = height;
nStretchy = 0; nStretchy = 0;
nVisible = 0;
for (struct boxChild &bc : *(b->controls)) { for (struct boxChild &bc : *(b->controls)) {
if (!uiControlVisible(bc.c)) if (!uiControlVisible(bc.c))
continue; continue;
nVisible++;
if (bc.stretchy) { if (bc.stretchy) {
nStretchy++; nStretchy++;
continue; continue;
@ -81,24 +77,35 @@ static void boxRelayout(uiBox *b)
stretchywid -= minimumWidth; stretchywid -= minimumWidth;
} }
} }
if (nVisible == 0) // nothing to do
return;
// 2) now get the size of stretchy controls // 2) now inset the available rect by the needed padding
if (nStretchy != 0) if (b->vertical) {
height -= (nVisible - 1) * ypadding;
stretchyht -= (nVisible - 1) * ypadding;
} else {
width -= (nVisible - 1) * xpadding;
stretchywid -= (nVisible - 1) * xpadding;
}
// 3) now get the size of stretchy controls
if (nStretchy != 0) {
if (b->vertical) if (b->vertical)
stretchyht /= nStretchy; stretchyht /= nStretchy;
else else
stretchywid /= nStretchy; stretchywid /= nStretchy;
// TODO put this in the above if for (struct boxChild &bc : *(b->controls)) {
for (struct boxChild &bc : *(b->controls)) { if (!uiControlVisible(bc.c))
if (!uiControlVisible(bc.c)) continue;
continue; if (bc.stretchy) {
if (bc.stretchy) { bc.width = stretchywid;
bc.width = stretchywid; bc.height = stretchyht;
bc.height = stretchyht; }
} }
} }
// 3) now we can position controls // 4) now we can position controls
// first, make relative to the top-left corner of the container // first, make relative to the top-left corner of the container
x = 0; x = 0;
y = 0; y = 0;
@ -159,6 +166,7 @@ static void uiBoxMinimumSize(uiWindowsControl *c, int *width, int *height)
int maxStretchyWidth, maxStretchyHeight; int maxStretchyWidth, maxStretchyHeight;
int i; int i;
int minimumWidth, minimumHeight; int minimumWidth, minimumHeight;
int nVisible;
uiWindowsSizing sizing; uiWindowsSizing sizing;
*width = 0; *width = 0;
@ -169,21 +177,16 @@ static void uiBoxMinimumSize(uiWindowsControl *c, int *width, int *height)
// 0) get this Box's padding // 0) get this Box's padding
boxPadding(b, &xpadding, &ypadding); boxPadding(b, &xpadding, &ypadding);
// 1) initialize the desired rect with the needed padding // 1) add in the size of non-stretchy controls and get (but not add in) the largest widths and heights of stretchy controls
// TODO this is wrong if any controls are hidden
if (b->vertical)
*height = (b->controls->size() - 1) * ypadding;
else
*width = (b->controls->size() - 1) * xpadding;
// 2) add in the size of non-stretchy controls and get (but not add in) the largest widths and heights of stretchy controls
// we still add in like direction of stretchy controls // we still add in like direction of stretchy controls
nStretchy = 0; nStretchy = 0;
maxStretchyWidth = 0; maxStretchyWidth = 0;
maxStretchyHeight = 0; maxStretchyHeight = 0;
nVisible = 0;
for (const struct boxChild &bc : *(b->controls)) { for (const struct boxChild &bc : *(b->controls)) {
if (!uiControlVisible(bc.c)) if (!uiControlVisible(bc.c))
continue; continue;
nVisible++;
uiWindowsControlMinimumSize(uiWindowsControl(bc.c), &minimumWidth, &minimumHeight); uiWindowsControlMinimumSize(uiWindowsControl(bc.c), &minimumWidth, &minimumHeight);
if (bc.stretchy) { if (bc.stretchy) {
nStretchy++; nStretchy++;
@ -204,6 +207,14 @@ static void uiBoxMinimumSize(uiWindowsControl *c, int *width, int *height)
*height = minimumHeight; *height = minimumHeight;
} }
} }
if (nVisible == 0) // just return 0x0
return;
// 2) now outset the desired rect with the needed padding
if (b->vertical)
*height += (nVisible - 1) * ypadding;
else
*width += (nVisible - 1) * xpadding;
// 3) and now we can add in stretchy controls // 3) and now we can add in stretchy controls
if (b->vertical) if (b->vertical)