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

Adjusted tWindow to use the new attachment system.

This commit is contained in:
Pietro Gagliardi 2015-08-02 14:06:49 -04:00
parent b508161d1e
commit 15ecebbccc
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
redo/osxaltest/window.m
View File

@ -43,8 +43,8 @@
{ {
NSView *contentView; NSView *contentView;
tAutoLayoutParams p; tAutoLayoutParams p;
NSUInteger i;
NSString *margin; NSString *margin;
void (^run)(NSArray *, NSArray *, NSArray *);
if (self->c == nil) if (self->c == nil)
return; return;
@ -53,9 +53,11 @@
[contentView removeConstraints:[contentView constraints]]; [contentView removeConstraints:[contentView constraints]];
p.horz = [NSMutableArray new]; p.horz = [NSMutableArray new];
p.horzAttachLeft = [NSMutableArray new];
p.horzAttachRight = [NSMutableArray new];
p.vert = [NSMutableArray new]; p.vert = [NSMutableArray new];
p.extra = [NSMutableArray new]; p.vertAttachTop = [NSMutableArray new];
p.extraVert = [NSMutableArray new]; p.vertAttachBottom = [NSMutableArray new];
p.views = [NSMutableDictionary new]; p.views = [NSMutableDictionary new];
p.n = 0; p.n = 0;
[self->c tFillAutoLayout:&p]; [self->c tFillAutoLayout:&p];
@ -63,27 +65,35 @@
margin = @""; margin = @"";
if (self->margined) if (self->margined)
margin = @"-"; margin = @"-";
[p.horz enumerateObjectsUsingBlock:^(id obj, NSUInteger index, BOOL *stop) {
[p.extra addObject:[NSString stringWithFormat:@"|%@%@%@|", margin, obj, margin]];
[p.extraVert addObject:@NO];
}];
[p.vert enumerateObjectsUsingBlock:^(id obj, NSUInteger index, BOOL *stop) {
[p.extra addObject:[NSString stringWithFormat:@"|%@%@%@|", margin, obj, margin]];
[p.extraVert addObject:@YES];
}];
for (i = 0; i < [p.extra count]; i++) {
NSString *constraint;
NSNumber *vertical;
NSArray *constraints;
vertical = (NSNumber *) [p.extraVert objectAtIndex:i]; run = ^(NSArray *side, NSArray *attachStart, NSArray *attachEnd) {
if ([vertical boolValue]) NSUInteger i;
constraint = [NSString stringWithFormat:@"V:%@", [p.extra objectAtIndex:i]];
else for (i = 0; i < [side count]; i++) {
constraint = [NSString stringWithFormat:@"H:%@", [p.extra objectAtIndex:i]]; NSMutableString *constraint;
constraints = [NSLayoutConstraint constraintsWithVisualFormat:constraint options:0 metrics:nil views:p.views]; NSNumber *attach;
[contentView addConstraints:constraints]; NSArray *constraints;
}
constraint = [NSMutableString stringWithString:@"H:"];
attach = (NSNumber *) [attachStart objectAtIndex:i];
if ([attach boolValue]) {
[constraint appendString:@"|"];
[constraint appendString:margin];
}
[constraint appendString:[side objectAtIndex:i]];
attach = (NSNumber *) [attachEnd objectAtIndex:i];
if ([attach boolValue]) {
[constraint appendString:margin];
[constraint appendString:@"|"];
}
constraints = [NSLayoutConstraint constraintsWithVisualFormat:constraint options:0 metrics:nil views:p.views];
[contentView addConstraints:constraints];
[constraint release];
}
};
run(p.horz, p.horzAttachLeft, p.horzAttachRight);
run(p.vert, p.vertAttachTop, p.vertAttachBottom);
// TODO release everything // TODO release everything
} }