From 682903fba5f2fc5e109ce36bb9d96421b70b74ff Mon Sep 17 00:00:00 2001 From: Aaron Schubert Date: Tue, 23 Feb 2016 10:36:53 +0000 Subject: [PATCH] Make ASDisplayNode unable to be focused by default. ASControlNode will be the new default. --- AsyncDisplayKit/ASDisplayNode.mm | 2 +- AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index 6b39ea8848..01af3356e0 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -2602,7 +2602,7 @@ static const char *ASDisplayNodeDrawingPriorityKey = "ASDrawingPriority"; - (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context { - return YES; + return NO; } - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator diff --git a/AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm b/AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm index dbbf6d504c..923e9763ee 100644 --- a/AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm +++ b/AsyncDisplayKit/Private/ASDisplayNode+UIViewBridge.mm @@ -104,7 +104,7 @@ if (shouldApply) { _layer.layerProperty = (layerValueExpr); } else { ASDisplayNo // Focus Engine - (BOOL)canBecomeFocused { - return YES; + return NO; } - (void)setNeedsFocusUpdate @@ -121,7 +121,7 @@ if (shouldApply) { _layer.layerProperty = (layerValueExpr); } else { ASDisplayNo - (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context { - return YES; + return NO; } - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator