From 7b0a8f5af32a35e3f83297fa3ea3cb8dbb0118df Mon Sep 17 00:00:00 2001 From: Aaron Schubert Date: Thu, 21 Apr 2016 09:33:32 +0100 Subject: [PATCH] [tvOS] Improve -getView by making use of helper method --- AsyncDisplayKit/ASImageNode+tvOS.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKit/ASImageNode+tvOS.m b/AsyncDisplayKit/ASImageNode+tvOS.m index 29181d06..ac7647aa 100644 --- a/AsyncDisplayKit/ASImageNode+tvOS.m +++ b/AsyncDisplayKit/ASImageNode+tvOS.m @@ -9,6 +9,7 @@ #if TARGET_OS_TV #import "ASImageNode+tvOS.h" #import +#import "ASDisplayNodeExtras.h" @implementation ASImageNode (tvOS) @@ -175,9 +176,11 @@ - (UIView *)getView { UIView *view = self.view; - //If we are inside a ASCellNode, then we need to apply our focus effects to the ASCellNode view/layer rather than the ASImageNode view/layer. - if (CGSizeEqualToSize(self.view.superview.frame.size, self.view.frame.size) && self.view.superview.superview) { - view = self.view.superview.superview; + UIView *rootView = ASDisplayNodeUltimateParentOfNode(self).view + // TODO: This needs to be re-visited to handle all possibilities. + // If we are inside a ASCellNode, then we need to apply our focus effects to the ASCellNode view/layer rather than the ASImageNode view/layer. + if (CGSizeEqualToSize(rootView.frame.size, view.frame.size) && rootView) { + view = rootView; } return view; }