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

Merge branch 'revert-7c099a5b' into 'develop'

Browse Source 
Revert "Merge branch 'feature/usenewfont' into 'develop'"

See merge request BPHV_MIPS/mvm_core_ui!367
This commit is contained in:
Pfeil, Scott Robert 2020-04-08 11:52:26 -04:00
commit d7beae4ae5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MVMCoreUI/Utility/MFFonts.m
View File

@ -85,20 +85,14 @@ NSString * const DS55Rg = @"NHaasGroteskDSStd-55Rg";
+ (nonnull UIFont *)mfFont75Bd:(CGFloat)size { + (nonnull UIFont *)mfFont75Bd:(CGFloat)size {
[self loadMVMFonts]; [self loadMVMFonts];
if (size >= 15) { UIFont *font = [UIFont fontWithName:DS75Bd size:size];
return [MFFonts mfFontDSBold:size]; return font ?: [UIFont boldSystemFontOfSize:size];
} else {
return [MFFonts mfFontTXBold:size];
}
} }
+ (nonnull UIFont *)mfFont55Rg:(CGFloat)size { + (nonnull UIFont *)mfFont55Rg:(CGFloat)size {
[self loadMVMFonts]; [self loadMVMFonts];
if (size >= 15) { UIFont *font = [UIFont fontWithName:DS55Rg size:size];
return [MFFonts mfFontDSRegular:size]; return font ?: [UIFont systemFontOfSize:size];
} else {
return [MFFonts mfFontTXRegular:size];
}
} }
+ (nullable UIFont *)mfFontOcratxt:(CGFloat)size { + (nullable UIFont *)mfFontOcratxt:(CGFloat)size {