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

Took an alternate route through the constraints in the grid. This should be a bit easier...

This commit is contained in:
Pietro Gagliardi 2016-06-12 12:31:44 -04:00
parent 31f2b6d059
commit 8f0bac54a3
1 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
darwin/grid.m
View File

@ -133,6 +133,7 @@ struct uiGrid {
NSNumber *number; NSNumber *number;
NSLayoutConstraint *c; NSLayoutConstraint *c;
NSView **colviews, **rowviews; NSView **colviews, **rowviews;
NSView *firstView;
[self removeOurConstraints]; [self removeOurConstraints];
if ([self->children count] == 0) if ([self->children count] == 0)
@ -237,7 +238,57 @@ struct uiGrid {
[self addConstraint:c]; [self addConstraint:c];
[self->edges addObject:c]; [self->edges addObject:c];
} }
[set release];
// now put all the views in the same row and column together
for (x = 0; x < xcount; x++) {
[set removeAllObjects];
for (y = 0; y < ycount; y++)
[set addObject:[NSNumber numberWithInt:gg[y][x]]];
first = YES;
for (number in set) {
if ([number intValue] == -1)
continue;
gc = (gridChild *) [self->children objectAtIndex:[number intValue]];
if (first) {
firstView = [gc view];
first = NO;
continue;
}
c = mkConstraint([gc view], NSLayoutAttributeLeading,
NSLayoutRelationEqual,
firstView, NSLayoutAttributeLeading,
1, 0,
@"uiGrid column left edge constraint");
[self addConstraint:c];
[self->edges addObject:c];
}
}
for (y = 0; y < ycount; y++) {
[set removeAllObjects];
for (x = 0; x < xcount; x++)
[set addObject:[NSNumber numberWithInt:gg[y][x]]];
first = YES;
for (number in set) {
if ([number intValue] == -1)
continue;
gc = (gridChild *) [self->children objectAtIndex:[number intValue]];
if (first) {
firstView = [gc view];
first = NO;
continue;
}
c = mkConstraint([gc view], NSLayoutAttributeTop,
NSLayoutRelationEqual,
firstView, NSLayoutAttributeTop,
1, 0,
@"uiGrid row top edge constraint");
[self addConstraint:c];
[self->edges addObject:c];
}
}
// TODO
return;
// now go through every row and column and extract SOME view from that row and column for the inner constraints // now go through every row and column and extract SOME view from that row and column for the inner constraints
// if it turns out that a row or column is totally empty, duplicate the one to the left (this has the effect of collapsing empty rows) // if it turns out that a row or column is totally empty, duplicate the one to the left (this has the effect of collapsing empty rows)
@ -310,6 +361,7 @@ struct uiGrid {
// and finally clean up // and finally clean up
uiFree(colviews); uiFree(colviews);
uiFree(rowviews); uiFree(rowviews);
[set release];
for (y = 0; y < ycount; y++) for (y = 0; y < ycount; y++)
uiFree(gg[y]); uiFree(gg[y]);
uiFree(gg); uiFree(gg);