Started converting tBox to the attachcment-based system. I think I'll need to introduce a few more parameters (first/last horz/vert).
This commit is contained in:
parent
15ecebbccc
commit
3e8aad0068
|
@ -48,6 +48,8 @@
|
||||||
- (void)tFillAutoLayout:(tAutoLayoutParams *)p
|
- (void)tFillAutoLayout:(tAutoLayoutParams *)p
|
||||||
{
|
{
|
||||||
NSMutableArray *subhorz, *subvert;
|
NSMutableArray *subhorz, *subvert;
|
||||||
|
NSMutableArray *subhorzleft, *subhorzright;
|
||||||
|
NSMutableArray *subverttop, *subvertbottom;
|
||||||
uintmax_t *first;
|
uintmax_t *first;
|
||||||
NSUInteger i;
|
NSUInteger i;
|
||||||
NSMutableString *out;
|
NSMutableString *out;
|
||||||
|
@ -59,12 +61,18 @@
|
||||||
if (first == NULL)
|
if (first == NULL)
|
||||||
abort();
|
abort();
|
||||||
subhorz = [NSMutableArray new];
|
subhorz = [NSMutableArray new];
|
||||||
|
subhorzleft = [NSMutableArray new];
|
||||||
|
subhorzright = [NSMutableArray new];
|
||||||
subvert = [NSMutableArray new];
|
subvert = [NSMutableArray new];
|
||||||
|
subverttop = [NSMutableArray new];
|
||||||
|
subvertbottom = [NSMutableArray new];
|
||||||
|
|
||||||
pp.horz = subhorz;
|
pp.horz = subhorz;
|
||||||
|
pp.horzAttachLeft = subhorzleft;
|
||||||
|
pp.horzAttachRight = subhorzright;
|
||||||
pp.vert = subvert;
|
pp.vert = subvert;
|
||||||
pp.extra = p->extra;
|
pp.vertAttachTop = subverttop;
|
||||||
pp.extraVert = p->extraVert;
|
pp.vertAttachBottom = subvertbottom;
|
||||||
pp.views = p->views;
|
pp.views = p->views;
|
||||||
pp.n = p->n;
|
pp.n = p->n;
|
||||||
pp.stretchyVert = self->vertical;
|
pp.stretchyVert = self->vertical;
|
||||||
|
@ -105,7 +113,11 @@
|
||||||
[secondaryout addObjectsFromArray:secondaryin];
|
[secondaryout addObjectsFromArray:secondaryin];
|
||||||
|
|
||||||
[subhorz release];
|
[subhorz release];
|
||||||
|
[subhorzleft release];
|
||||||
|
[subhorzright release];
|
||||||
[subvert release];
|
[subvert release];
|
||||||
|
[subverttop release];
|
||||||
|
[subvertbottom release];
|
||||||
free(first);
|
free(first);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue