From 647a9409d64f61ba107abece29c6641538e35854 Mon Sep 17 00:00:00 2001 From: Ryan Nystrom Date: Fri, 5 Dec 2014 15:25:55 -0800 Subject: [PATCH] Support UIViewContentModeCenter with ASImageNode --- AsyncDisplayKit/ASImageNode.mm | 3 ++- AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm | 2 +- examples/Kittens/Sample/KittenNode.m | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AsyncDisplayKit/ASImageNode.mm b/AsyncDisplayKit/ASImageNode.mm index 5f532aadea..7f19f17567 100644 --- a/AsyncDisplayKit/ASImageNode.mm +++ b/AsyncDisplayKit/ASImageNode.mm @@ -181,7 +181,8 @@ || 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 index 3e906a8225..9fb21dad84 100644 --- a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm +++ b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm @@ -309,7 +309,7 @@ static void __ASDisplayLayerDecrementConcurrentDisplayCount(BOOL displayIsAsync, 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 index f87d5118a3..dfa1499bfd 100644 --- a/examples/Kittens/Sample/KittenNode.m +++ b/examples/Kittens/Sample/KittenNode.m @@ -79,6 +79,7 @@ static const CGFloat kInnerPadding = 10.0f; _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