Fix "aspectSizeThatFits" padding.

vlfm · Sep 27, 2014 · 236c835 · 236c835
1 parent ef1c20f
commit 236c835
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/VFAspectRatio.m b/src/VFAspectRatio.m
@@ -28,17 +28,23 @@ - (instancetype)initWithWidth:(NSInteger)width height:(NSInteger)height {
 }
 
 - (CGSize)aspectSizeThatFits:(CGSize)size padding:(CGFloat)padding {
+    CGFloat cut = padding * 2;
+    CGSize paddedSize = CGSizeMake(size.width - cut, size.height - cut);
+    return [self aspectSizeThatFits:paddedSize];
+}
+
+- (CGSize)aspectSizeThatFits:(CGSize)size {
     CGFloat w = 0;
     CGFloat h = 0;
 
     if (_width == _height) {
-        w = MIN(size.width, size.height) - padding;
+        w = MIN(size.width, size.height);
         h = w;
     } else if (_width > _height) {
-        w = size.width - padding;
+        w = size.width;
         h = (w / _width) * _height;
     } else {
-        h = size.height - padding;
+        h = size.height;
         w = (h / _height) * _width;
     }