|
@@ -46,7 +46,14 @@ NSString *const kXCFontScaleFactorKey = @"factor";
|
|
|
- (instancetype)init {
|
|
|
self = [super init];
|
|
|
if (self) {
|
|
|
- self.factorValue = [self.storage doubleForKey:kXCFontScaleFactorKey];
|
|
|
+ NSNumber *number = [self.storage valueForKey:kXCFontScaleFactorKey];
|
|
|
+ if (!number) {
|
|
|
+ number = @0.2;
|
|
|
+ }
|
|
|
+ if (![number isKindOfClass:[NSNumber class]]) {
|
|
|
+ number = @0.2;
|
|
|
+ }
|
|
|
+ self.factorValue = [number doubleValue];
|
|
|
self.fontSizeObservers = [NSMutableArray new];
|
|
|
self.fontSizeChangeObserverLock = [[NSLock alloc] init];
|
|
|
}
|
|
@@ -58,12 +65,12 @@ NSString *const kXCFontScaleFactorKey = @"factor";
|
|
|
_factorValue = MIN(MAX(factorValue, 0.f), 1.f);
|
|
|
if (fabs(oldValue - _factorValue) > CGFLOAT_EPSILON) {
|
|
|
[self sendFontSizeChangeNotificationToObservers];
|
|
|
- [self.storage setDouble:self.factorValue forKey:kXCFontScaleFactorKey];
|
|
|
+ [self.storage setValue:@(self.factorValue) forKey:kXCFontScaleFactorKey];
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- (CGFloat)fontSizeWithFactor:(CGFloat)fontSize {
|
|
|
- CGFloat multipy = 1.f + self.factorValue;
|
|
|
+ CGFloat multipy = 0.8 + self.factorValue;
|
|
|
return fontSize * multipy;
|
|
|
}
|
|
|
|