Support UIViewContentModeCenter with ASImageNode

rnystrom · rnystrom · commit 647a9409d64f · 2014-12-05T15:25:55.000-08:00
diff --git a/AsyncDisplayKit/ASImageNode.mm b/AsyncDisplayKit/ASImageNode.mm
@@ -181,7 +181,8 @@ + (UIImage *)displayWithParameters:(_ASImageNodeDrawParameters *)parameters isCa
                        || alphaInfo == kCGImageAlphaPremultipliedLast;
 
   BOOL contentModeSupported =    contentMode == UIViewContentModeScaleAspectFill
-                              || contentMode == UIViewContentModeScaleAspectFit;
+                              || contentMode == UIViewContentModeScaleAspectFit
+                              || contentMode == UIViewContentModeCenter;
 
   CGSize backingSize;
   CGRect imageDrawRect;
diff --git a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm
@@ -309,7 +309,7 @@ - (void)displayAsyncLayer:(_ASDisplayLayer *)asyncLayer asynchronously:(BOOL)asy
       if (stretchable) {
         ASDisplayNodeSetupLayerContentsWithResizableImage(_layer, image);
       } else {
-        _layer.contentsScale = image.scale;
+        _layer.contentsScale = self.contentsScale;
         _layer.contents = (id)image.CGImage;
       }
       [self didDisplayAsyncLayer:self.asyncLayer];
diff --git a/examples/Kittens/Sample/KittenNode.m b/examples/Kittens/Sample/KittenNode.m
@@ -79,6 +79,7 @@ - (instancetype)initWithKittenOfSize:(CGSize)size
   _imageNode.URL = [NSURL URLWithString:[NSString stringWithFormat:@"http://placekitten.com/%zd/%zd",
                                                                    (NSInteger)roundl(_kittenSize.width),
                                                                    (NSInteger)roundl(_kittenSize.height)]];
+//  _imageNode.contentMode = UIViewContentModeCenter;
   [self addSubnode:_imageNode];
 
   // lorem ipsum text, plus some nice styling

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ - (void)displayAsyncLayer:(_ASDisplayLayer *)asyncLayer asynchronously:(BOOL)asy`
`309`	`309`	`if (stretchable) {`
`310`	`310`	`ASDisplayNodeSetupLayerContentsWithResizableImage(_layer, image);`
`311`	`311`	`} else {`
`312`		`- _layer.contentsScale = image.scale;`
	`312`	`+ _layer.contentsScale = self.contentsScale;`
`313`	`313`	`_layer.contents = (id)image.CGImage;`
`314`	`314`	`}`
`315`	`315`	`[self didDisplayAsyncLayer:self.asyncLayer];`