view controller assignment cycle fix

PrimaryFeather · Apr 15, 2016 · 61ab8f6 · 61ab8f6
1 parent af7b638
commit 61ab8f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/sparrow/src/Classes/SPView.h b/sparrow/src/Classes/SPView.h
@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) CAEAGLLayer *layer;
 
 /// The parent view controller of this view.
-@property (nonatomic, readonly) SPViewController *viewController;
+@property (nonatomic, weak, readonly) SPViewController *viewController;
 
 @end
 

diff --git a/sparrow/src/Classes/SPView.m b/sparrow/src/Classes/SPView.m
@@ -13,10 +13,16 @@
 #import "SPView_Internal.h"
 #import "SPViewController_Internal.h"
 
+#import <objc/runtime.h>
+
+@interface SPView ()
+
+@property (nonatomic, weak) SPViewController *viewController;
+
+@end
+
+
 @implementation SPView
-{
-    SPViewController __weak *_viewController;
-}
 
 @dynamic layer;
 
@@ -52,33 +58,24 @@ - (void)initCommon
 
 - (void)displayLayer:(CALayer *)layer
 {
-    [_viewController render];
+    [self.viewController render];
 }
 
 - (void)layoutSubviews
 {
     [super layoutSubviews];
 
-    [_viewController viewDidResize:self.frame];
-    [_viewController render];
+    [self.viewController viewDidResize:self.frame];
+    [self.viewController render];
 }
 
 - (void)setFrame:(CGRect)frame
 {
     if (!CGRectEqualToRect(frame, super.frame))
     {
         super.frame = frame;
-        [_viewController viewDidResize:self.frame];
+        [self.viewController viewDidResize:self.frame];
     }
 }
 
 @end
-
-@implementation SPView (Internal)
-
-- (void)setViewController:(SPViewController *)viewController
-{
-    _viewController = viewController;
-}
-
-@end
diff --git a/sparrow/src/Classes/SPViewController.m b/sparrow/src/Classes/SPViewController.m
@@ -484,6 +484,7 @@ - (void)setView:(SPView *)view
 {
     if (view != _internalView)
     {
+        if (_internalView) _internalView.viewController = nil;
         SP_RELEASE_AND_RETAIN(_internalView, view);
         [_previousViewPort setEmpty];