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

Fixes!

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2019-08-15 12:08:44 -04:00
parent f3f8d57a0b
commit d810667473
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MVMCoreUI/Atoms/Views/ViewConstrainingView.m
View File

@ -357,16 +357,20 @@
[super setWithJSON:json delegateObject:delegateObject additionalData:additionalData]; [super setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
[self.molecule setWithJSON:json delegateObject:delegateObject additionalData:additionalData]; [self.molecule setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
if (self.shouldSetupMoleculeFromJSON && !self.molecule) { if (self.shouldSetupMoleculeFromJSON) {
NSDictionary *moleculeJSON = [json dict:KeyMolecule]; NSDictionary *moleculeJSON = [json dict:KeyMolecule];
if (moleculeJSON) { if (self.molecule) {
[self.molecule setWithJSON:moleculeJSON delegateObject:delegateObject additionalData:additionalData];
} else if (moleculeJSON) {
UIView <MVMCoreUIMoleculeViewProtocol>*molecule = [[MVMCoreUIMoleculeMappingObject sharedMappingObject] createMoleculeForJSON:moleculeJSON delegateObject:delegateObject constrainIfNeeded:true]; UIView <MVMCoreUIMoleculeViewProtocol>*molecule = [[MVMCoreUIMoleculeMappingObject sharedMappingObject] createMoleculeForJSON:moleculeJSON delegateObject:delegateObject constrainIfNeeded:true];
if (molecule) { if (molecule) {
[self addMolecule:molecule]; [self addMolecule:molecule];
} }
self.molecule = molecule; self.molecule = molecule;
[self setMoleculeAccessibility];
} }
[self setMoleculeAccessibility]; } else {
[self.molecule setWithJSON:json delegateObject:delegateObject additionalData:additionalData];
} }
NSNumber *useHorizontalMargins = [json optionalNumberForKey:@"useHorizontalMargins"]; NSNumber *useHorizontalMargins = [json optionalNumberForKey:@"useHorizontalMargins"];

2
MVMCoreUI/Styles/MFStyler.m
View File

@ -97,7 +97,7 @@ CGFloat const LabelWithInternalButtonLineSpace = 2;
+ (void)setDefaultMarginsForView:(nullable UIView *)view size:(CGFloat)size horizontal:(BOOL)horizontal vertical:(BOOL)vertical { + (void)setDefaultMarginsForView:(nullable UIView *)view size:(CGFloat)size horizontal:(BOOL)horizontal vertical:(BOOL)vertical {
[MVMCoreDispatchUtility performBlockOnMainThread:^{ [MVMCoreDispatchUtility performBlockOnMainThread:^{
CGFloat horizontalPadding = horizontal ? [MFStyler defaultHorizontalPaddingForSize:size] : 0; CGFloat horizontalPadding = horizontal ? [MFStyler defaultHorizontalPaddingForSize:size] : 0;
CGFloat verticalPadding = vertical ? PaddingDefaultVerticalSpacing : 0; CGFloat verticalPadding = vertical ? 24 : 0;
[MVMCoreUIUtility setMarginsForView:view leading:horizontalPadding top:verticalPadding trailing:horizontalPadding bottom:verticalPadding]; [MVMCoreUIUtility setMarginsForView:view leading:horizontalPadding top:verticalPadding trailing:horizontalPadding bottom:verticalPadding];
}]; }];
} }