mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/kevin

Browse Source
This commit is contained in:
Christiano, Kevin 2019-03-19 16:04:36 -04:00
commit a07ea27b93
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCoreUI/Atoms/Views/MFLoadImageView.m
View File

@ -211,28 +211,32 @@
if (self.addSizeConstraintsForAspectRatio) { if (self.addSizeConstraintsForAspectRatio) {
if (width && height) { if (width && height) {
NSLayoutConstraint *constraint = [self.imageView.heightAnchor constraintEqualToConstant:height.floatValue]; NSLayoutConstraint *constraint = [self.imageView.heightAnchor constraintEqualToConstant:height.floatValue];
constraint.priority = 900;
constraint.active = YES; constraint.active = YES;
self.heightConstraint = constraint; self.heightConstraint = constraint;
constraint = [self.imageView.widthAnchor constraintEqualToConstant:width.floatValue]; constraint = [self.imageView.widthAnchor constraintEqualToConstant:width.floatValue];
constraint.priority = 900;
constraint.active = YES; constraint.active = YES;
self.widthConstraint = constraint; self.widthConstraint = constraint;
} else if (width) { } else if (width) {
NSLayoutConstraint *constraint = [self.imageView.widthAnchor constraintEqualToConstant:width.floatValue]; NSLayoutConstraint *constraint = [self.imageView.widthAnchor constraintEqualToConstant:width.floatValue];
constraint.priority = 900;
constraint.active = YES; constraint.active = YES;
self.widthConstraint = constraint; self.widthConstraint = constraint;
constraint = [self.imageView.heightAnchor constraintEqualToAnchor:self.imageView.widthAnchor multiplier:size.height/size.width]; constraint = [self.imageView.heightAnchor constraintEqualToAnchor:self.imageView.widthAnchor multiplier:size.height/size.width];
constraint.priority = 900;
constraint.active = YES; constraint.active = YES;
self.heightConstraint = constraint; self.heightConstraint = constraint;
} else if (height) { } else if (height) {
NSLayoutConstraint *constraint = [self.imageView.heightAnchor constraintEqualToConstant:height.floatValue]; NSLayoutConstraint *constraint = [self.imageView.heightAnchor constraintEqualToConstant:height.floatValue];
constraint.priority = 900;
constraint.active = YES; constraint.active = YES;
self.heightConstraint = constraint; self.heightConstraint = constraint;
constraint = [self.imageView.widthAnchor constraintEqualToAnchor:self.imageView.heightAnchor multiplier:size.width/size.height]; constraint = [self.imageView.widthAnchor constraintEqualToAnchor:self.imageView.heightAnchor multiplier:size.width/size.height];
constraint.priority = 900;
constraint.active = YES; constraint.active = YES;
self.widthConstraint = constraint; self.widthConstraint = constraint;
} }
self.widthConstraint.priority = 900;
self.heightConstraint.priority = 900;
[self.imageView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; [self.imageView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
[self.imageView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisVertical]; [self.imageView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisVertical];
} }