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

I don't know what's up. Fix a leak anyway.

This commit is contained in:
Pietro Gagliardi 2016-06-14 23:03:40 -04:00
parent 4b2d646345
commit c8dd546804
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
windows/grid.cpp
View File

@ -6,7 +6,7 @@
// - what happens if you call Append() twice? // - what happens if you call Append() twice?
// TODOs // TODOs
// - make ALL the controls handle hidden children right // - the Assorted page has clipping and repositioning issues
struct gridChild { struct gridChild {
uiControl *c; uiControl *c;
@ -209,8 +209,10 @@ static void gridRelayout(uiGrid *g)
gridPadding(g, &xpadding, &ypadding); gridPadding(g, &xpadding, &ypadding);
ld = new gridLayoutData(g); ld = new gridLayoutData(g);
if (ld->noVisible) // nothing to do if (ld->noVisible) { // nothing to do
delete ld;
return; return;
}
// 0) discount padding from width/height // 0) discount padding from width/height
width -= (ld->nVisibleColumns - 1) * xpadding; width -= (ld->nVisibleColumns - 1) * xpadding;
@ -465,8 +467,10 @@ static void uiGridMinimumSize(uiWindowsControl *c, int *width, int *height)
gridPadding(g, &xpadding, &ypadding); gridPadding(g, &xpadding, &ypadding);
ld = new gridLayoutData(g); ld = new gridLayoutData(g);
if (ld->noVisible) // nothing to do; return 0x0 if (ld->noVisible) { // nothing to do; return 0x0
delete ld;
return; return;
}
// 1) compute colwidths and rowheights before handling expansion // 1) compute colwidths and rowheights before handling expansion
// TODO put this in its own function (but careful about the spanning calculation in gridRelayout()) // TODO put this in its own function (but careful about the spanning calculation in gridRelayout())