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

Started saving the hugging priorities.

This commit is contained in:
Pietro Gagliardi 2015-08-03 00:56:14 -04:00
parent 410478e1c8
commit 1d2880895d
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redo/osxaltest/box.m
View File

@ -77,6 +77,8 @@
id<tControl> c; id<tControl> c;
c = (id<tControl>) obj; c = (id<tControl>) obj;
// this also resets the hugging priority
// TODO do this when adding and removing controls instead
[c tFillAutoLayout:&pp]; [c tFillAutoLayout:&pp];
[views setObject:pp.view forKey:tAutoLayoutKey(n)]; [views setObject:pp.view forKey:tAutoLayoutKey(n)];
n++; n++;

7
redo/osxaltest/button.m
View File

@ -4,6 +4,7 @@
@implementation tButton { @implementation tButton {
NSButton *b; NSButton *b;
id<tControl> parent; id<tControl> parent;
NSLayoutPriority horzpri, vertpri;
} }
- (id)tInitWithText:(NSString *)text - (id)tInitWithText:(NSString *)text
@ -19,6 +20,9 @@
[self->b setTranslatesAutoresizingMaskIntoConstraints:NO]; [self->b setTranslatesAutoresizingMaskIntoConstraints:NO];
self->parent = nil; self->parent = nil;
self->horzpri = [self->b contentHuggingPriorityForOrientation:NSLayoutConstraintOrientationHorizontal];
self->vertpri = [self->b contentHuggingPriorityForOrientation:NSLayoutConstraintOrientationVertical];
} }
return self; return self;
} }
@ -33,6 +37,9 @@
- (void)tFillAutoLayout:(tAutoLayoutParams *)p - (void)tFillAutoLayout:(tAutoLayoutParams *)p
{ {
// reset the hugging priority
[self->b setContentHuggingPriority:self->horzpri forOrientation:NSLayoutConstraintOrientationHorizontal];
[self->b setContentHuggingPriority:self->vertpri forOrientation:NSLayoutConstraintOrientationVertical];
p->view = self->b; p->view = self->b;
p->attachLeft = YES; p->attachLeft = YES;
p->attachTop = YES; p->attachTop = YES;

7
redo/osxaltest/spinbox.m
View File

@ -19,6 +19,7 @@
NSTextField *t; NSTextField *t;
NSStepper *s; NSStepper *s;
id<tControl> parent; id<tControl> parent;
NSLayoutPriority horzpri, vertpri;
} }
- (id)init - (id)init
@ -63,6 +64,9 @@
[views release]; [views release];
self->parent = nil; self->parent = nil;
self->horzpri = [self->c contentHuggingPriorityForOrientation:NSLayoutConstraintOrientationHorizontal];
self->vertpri = [self->c contentHuggingPriorityForOrientation:NSLayoutConstraintOrientationVertical];
} }
return self; return self;
} }
@ -77,6 +81,9 @@
- (void)tFillAutoLayout:(tAutoLayoutParams *)p - (void)tFillAutoLayout:(tAutoLayoutParams *)p
{ {
// reset the hugging priority
[self->c setContentHuggingPriority:self->horzpri forOrientation:NSLayoutConstraintOrientationHorizontal];
[self->c setContentHuggingPriority:self->vertpri forOrientation:NSLayoutConstraintOrientationVertical];
p->view = self->c; p->view = self->c;
p->attachLeft = YES; p->attachLeft = YES;
p->attachTop = YES; p->attachTop = YES;