|
@@ -49,11 +49,18 @@ static CGRect _YYCGRectFitWithContentMode(CGRect rect, CGSize size, UIViewConten
|
|
rect.size = CGSizeZero;
|
|
rect.size = CGSizeZero;
|
|
} else {
|
|
} else {
|
|
CGFloat scale;
|
|
CGFloat scale;
|
|
- if (size.width / size.height < rect.size.width / rect.size.height &&
|
|
|
|
- mode == UIViewContentModeScaleAspectFit) {
|
|
|
|
- scale = rect.size.height / size.height;
|
|
|
|
|
|
+ if (mode == UIViewContentModeScaleAspectFit) {
|
|
|
|
+ if (size.width / size.height < rect.size.width / rect.size.height) {
|
|
|
|
+ scale = rect.size.height / size.height;
|
|
|
|
+ } else {
|
|
|
|
+ scale = rect.size.width / size.width;
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
- scale = rect.size.width / size.width;
|
|
|
|
|
|
+ if (size.width / size.height < rect.size.width / rect.size.height) {
|
|
|
|
+ scale = rect.size.width / size.width;
|
|
|
|
+ } else {
|
|
|
|
+ scale = rect.size.height / size.height;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
size.width *= scale;
|
|
size.width *= scale;
|
|
size.height *= scale;
|
|
size.height *= scale;
|