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

Readded stretchiness.

This commit is contained in:
Pietro Gagliardi 2015-08-02 23:17:20 -04:00
parent 17a17b0d27
commit 0adf51118e
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
redo/osxaltest/box.m
View File

@ -54,29 +54,24 @@
[self tRelayout]; [self tRelayout];
} }
// TODO stretchy
// TODO spaced // TODO spaced
- (void)tFillAutoLayout:(tAutoLayoutParams *)p - (void)tFillAutoLayout:(tAutoLayoutParams *)p
{ {
NSMutableDictionary *views; NSMutableDictionary *views;
__block uintmax_t i, n; __block uintmax_t i, n;
__block tAutoLayoutParams pp; __block tAutoLayoutParams pp;
__block BOOL anyStretchy;
NSMutableString *constraint; NSMutableString *constraint;
BOOL firstStretchy;
uintmax_t nStretchy;
[self->v removeConstraints:[self->v constraints]]; [self->v removeConstraints:[self->v constraints]];
views = [NSMutableDictionary new]; views = [NSMutableDictionary new];
n = 0; n = 0;
anyStretchy = NO;
[self->children enumerateObjectsUsingBlock:^(id obj, NSUInteger index, BOOL *stop) { [self->children enumerateObjectsUsingBlock:^(id obj, NSUInteger index, BOOL *stop) {
id<tControl> c; id<tControl> c;
NSNumber *isStretchy;
c = (id<tControl>) obj; c = (id<tControl>) obj;
isStretchy = (NSNumber *) [self->stretchy objectAtIndex:index];
if ([isStretchy boolValue])
anyStretchy = YES;
[c tFillAutoLayout:&pp]; [c tFillAutoLayout:&pp];
[views setObject:pp.view forKey:tAutoLayoutKey(n)]; [views setObject:pp.view forKey:tAutoLayoutKey(n)];
n++; n++;
@ -87,9 +82,22 @@
constraint = [NSMutableString stringWithString:@"V:|"]; constraint = [NSMutableString stringWithString:@"V:|"];
else else
constraint = [NSMutableString stringWithString:@"H:|"]; constraint = [NSMutableString stringWithString:@"H:|"];
firstStretchy = YES;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
NSNumber *isStretchy;
[constraint appendString:@"["]; [constraint appendString:@"["];
[constraint appendString:tAutoLayoutKey(i)]; [constraint appendString:tAutoLayoutKey(i)];
isStretchy = (NSNumber *) [self->stretchy objectAtIndex:i];
if ([isStretchy boolValue])
if (firstStretchy) {
firstStretchy = NO;
nStretchy = i;
} else {
[constraint appendString:@"(=="];
[constraint appendString:tAutoLayoutKey(nStretchy)];
[constraint appendString:@")"];
}
[constraint appendString:@"]"]; [constraint appendString:@"]"];
} }
[constraint appendString:@"|"]; [constraint appendString:@"|"];
@ -115,11 +123,12 @@
p->attachLeft = YES; p->attachLeft = YES;
p->attachTop = YES; p->attachTop = YES;
// don't attach to the end if there weren't any stretchy controls // don't attach to the end if there weren't any stretchy controls
// firstStretchy is NO if there was at least one stretchy control
if (self->vertical) { if (self->vertical) {
p->attachRight = YES; p->attachRight = YES;
p->attachBottom = anyStretchy; p->attachBottom = !firstStretchy;
} else { } else {
p->attachRight = anyStretchy; p->attachRight = !firstStretchy;
p->attachBottom = YES; p->attachBottom = YES;
} }
} }