Merge remote-tracking branch 'origin/pr/735'

anaisbetts · anaisbetts · commit c3ff38a0299b · 2014-10-11T01:09:17.000-04:00
diff --git a/ReactiveUI/Cocoa/ReactiveCollectionView.cs b/ReactiveUI/Cocoa/ReactiveCollectionView.cs
@@ -21,7 +21,7 @@
 namespace ReactiveUI
 {
     public abstract class ReactiveCollectionView : UICollectionView, 
-        IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate
+        IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         protected ReactiveCollectionView(RectangleF frame, UICollectionViewLayout layout) : base(frame, layout) { setupRxObj(); }
         protected ReactiveCollectionView(IntPtr handle) : base(handle) { setupRxObj(); }
@@ -97,5 +97,11 @@ public override void RemoveFromSuperview()
             base.RemoveFromSuperview();
             deactivated.OnNext(Unit.Default);
         }
+
+        void ICanForceManualActivation.Activate(bool activate) 
+        {
+            RxApp.MainThreadScheduler.Schedule(() => 
+		        (activate ? activated : deactivated).OnNext(Unit.Default));
+        }
     }
 }
diff --git a/ReactiveUI/Cocoa/ReactiveCollectionViewController.cs b/ReactiveUI/Cocoa/ReactiveCollectionViewController.cs
@@ -92,12 +92,14 @@ public override void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
+            this.ActivateSubviews(true);
         }
 
         public override void ViewDidDisappear(bool animated)
         {
             base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
+            this.ActivateSubviews(false);
         }
     }
 }
diff --git a/ReactiveUI/Cocoa/ReactiveControl.cs b/ReactiveUI/Cocoa/ReactiveControl.cs
@@ -16,7 +16,7 @@
 
 namespace ReactiveUI
 {
-    public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate
+    public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         protected ReactiveControl() : base()
         {
@@ -105,5 +105,11 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
             #endif
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
+
+        void ICanForceManualActivation.Activate(bool activate) 
+        {
+            RxApp.MainThreadScheduler.Schedule(() => 
+                (activate ? activated : deactivated).OnNext(Unit.Default));
+        }
     }
 }
diff --git a/ReactiveUI/Cocoa/ReactiveImageView.cs b/ReactiveUI/Cocoa/ReactiveImageView.cs
@@ -28,7 +28,7 @@
 
 namespace ReactiveUI
 {
-    public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate
+    public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         public ReactiveImageView(RectangleF frame) : base(frame) { }
         public ReactiveImageView(IntPtr handle) : base(handle) { }
@@ -100,6 +100,12 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
 #endif
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
+
+        void ICanForceManualActivation.Activate(bool activate) 
+        {
+            RxApp.MainThreadScheduler.Schedule(() => 
+                (activate ? activated : deactivated).OnNext(Unit.Default));
+        }
     }
 }
 
diff --git a/ReactiveUI/Cocoa/ReactiveNSView.cs b/ReactiveUI/Cocoa/ReactiveNSView.cs
@@ -29,7 +29,7 @@ namespace ReactiveUI
     /// This is an View that is both an NSView and has ReactiveObject powers 
     /// (i.e. you can call RaiseAndSetIfChanged)
     /// </summary>
-    public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate
+    public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         protected ReactiveView() : base()
         {
@@ -121,5 +121,11 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
 #endif
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
+
+        void ICanForceManualActivation.Activate(bool activate) 
+        {
+            RxApp.MainThreadScheduler.Schedule(() => 
+                (activate ? activated : deactivated).OnNext(Unit.Default));
+        }
     }
 }
diff --git a/ReactiveUI/Cocoa/ReactiveNSViewController.cs b/ReactiveUI/Cocoa/ReactiveNSViewController.cs
@@ -114,13 +114,36 @@ public override void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
+            this.ActivateSubviews(true);
         }
 
         public override void ViewDidDisappear(bool animated)
         {
             base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
+            this.ActivateSubviews(false);
         }
 #endif
     }
+
+    static class UIViewControllerMixins 
+    {
+        internal static void ActivateSubviews(this UIViewController This, bool activate) 
+        {
+            This.View.ActivateSubviews(activate);
+        }
+
+        static void ActivateSubviews(this UIView This, bool activate) 
+        {
+            foreach (var view in This.Subviews) {
+                var subview = view as ICanForceManualActivation;
+
+                if (subview != null) {
+                    subview.Activate(activate);
+                }
+
+                view.ActivateSubviews(activate);
+            }
+        }
+    }
 }
diff --git a/ReactiveUI/Cocoa/ReactivePageViewController.cs b/ReactiveUI/Cocoa/ReactivePageViewController.cs
@@ -95,12 +95,14 @@ public override void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
+            this.ActivateSubviews(true);
         }
 
         public override void ViewDidDisappear(bool animated)
         {
             base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
+            this.ActivateSubviews(false);
         }
     }
 }
diff --git a/ReactiveUI/Cocoa/ReactiveTabBarController.cs b/ReactiveUI/Cocoa/ReactiveTabBarController.cs
@@ -91,12 +91,14 @@ public override void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
+            this.ActivateSubviews(true);
         }
 
         public override void ViewDidDisappear(bool animated)
         {
             base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
+            this.ActivateSubviews(false);
         }
     }
 }
diff --git a/ReactiveUI/Cocoa/ReactiveTableView.cs b/ReactiveUI/Cocoa/ReactiveTableView.cs
@@ -21,7 +21,7 @@
 
 namespace ReactiveUI
 {
-    public abstract class ReactiveTableView : UITableView, IReactiveNotifyPropertyChanged<ReactiveTableView>, IHandleObservableErrors, IReactiveObject, ICanActivate
+    public abstract class ReactiveTableView : UITableView, IReactiveNotifyPropertyChanged<ReactiveTableView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
         public ReactiveTableView(RectangleF frame) : base(frame) { }
         public ReactiveTableView(IntPtr handle) : base(handle) { }
@@ -82,6 +82,12 @@ public override void WillMoveToSuperview(UIView newsuper)
             base.WillMoveToSuperview(newsuper);
             RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
         }
+
+        void ICanForceManualActivation.Activate(bool activate) 
+        {
+            RxApp.MainThreadScheduler.Schedule(() => 
+                (activate ? activated : deactivated).OnNext(Unit.Default));
+        }
     }
 }
 
diff --git a/ReactiveUI/Cocoa/ReactiveTableViewController.cs b/ReactiveUI/Cocoa/ReactiveTableViewController.cs
@@ -94,12 +94,14 @@ public override void ViewDidAppear(bool animated)
         {
             base.ViewDidAppear(animated);
             activated.OnNext(Unit.Default);
+            this.ActivateSubviews(true);
         }
 
         public override void ViewDidDisappear(bool animated)
         {
             base.ViewDidDisappear(animated);
             deactivated.OnNext(Unit.Default);
+            this.ActivateSubviews(false);
         }
     }
 }
diff --git a/ReactiveUI/Interfaces.cs b/ReactiveUI/Interfaces.cs
@@ -452,6 +452,11 @@ public interface ICanActivate
         IObservable<Unit> Deactivated { get; }
     }
 
+    internal interface ICanForceManualActivation 
+    {
+        void Activate(bool activate);
+    }
+
     /// <summary>
     /// Allows an additional string to make view resolution more specific than
     /// just a type.

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`namespace ReactiveUI`
`22`	`22`	`{`
`23`	`23`	`public abstract class ReactiveCollectionView : UICollectionView,`
`24`		`- IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate`
	`24`	`+ IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`25`	`25`	`{`
`26`	`26`	`protected ReactiveCollectionView(RectangleF frame, UICollectionViewLayout layout) : base(frame, layout) { setupRxObj(); }`
`27`	`27`	`protected ReactiveCollectionView(IntPtr handle) : base(handle) { setupRxObj(); }`
`@@ -97,5 +97,11 @@ public override void RemoveFromSuperview()`
`97`	`97`	`base.RemoveFromSuperview();`
`98`	`98`	`deactivated.OnNext(Unit.Default);`
`99`	`99`	`}`
	`100`	`+`
	`101`	`+ void ICanForceManualActivation.Activate(bool activate)`
	`102`	`+ {`
	`103`	`+ RxApp.MainThreadScheduler.Schedule(() =>`
	`104`	`+ (activate ? activated : deactivated).OnNext(Unit.Default));`
	`105`	`+ }`
`100`	`106`	`}`
`101`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,14 @@ public override void ViewDidAppear(bool animated)`
`92`	`92`	`{`
`93`	`93`	`base.ViewDidAppear(animated);`
`94`	`94`	`activated.OnNext(Unit.Default);`
	`95`	`+ this.ActivateSubviews(true);`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`public override void ViewDidDisappear(bool animated)`
`98`	`99`	`{`
`99`	`100`	`base.ViewDidDisappear(animated);`
`100`	`101`	`deactivated.OnNext(Unit.Default);`
	`102`	`+ this.ActivateSubviews(false);`
`101`	`103`	`}`
`102`	`104`	`}`
`103`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace ReactiveUI`
`18`	`18`	`{`
`19`		`- public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate`
	`19`	`+ public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`20`	`20`	`{`
`21`	`21`	`protected ReactiveControl() : base()`
`22`	`22`	`{`
`@@ -105,5 +105,11 @@ public override void ViewWillMoveToSuperview(NSView newsuper)`
`105`	`105`	`#endif`
`106`	`106`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+ void ICanForceManualActivation.Activate(bool activate)`
	`110`	`+ {`
	`111`	`+ RxApp.MainThreadScheduler.Schedule(() =>`
	`112`	`+ (activate ? activated : deactivated).OnNext(Unit.Default));`
	`113`	`+ }`
`108`	`114`	`}`
`109`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`namespace ReactiveUI`
`30`	`30`	`{`
`31`		`- public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate`
	`31`	`+ public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`32`	`32`	`{`
`33`	`33`	`public ReactiveImageView(RectangleF frame) : base(frame) { }`
`34`	`34`	`public ReactiveImageView(IntPtr handle) : base(handle) { }`
`@@ -100,6 +100,12 @@ public override void ViewWillMoveToSuperview(NSView newsuper)`
`100`	`100`	`#endif`
`101`	`101`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ void ICanForceManualActivation.Activate(bool activate)`
	`105`	`+ {`
	`106`	`+ RxApp.MainThreadScheduler.Schedule(() =>`
	`107`	`+ (activate ? activated : deactivated).OnNext(Unit.Default));`
	`108`	`+ }`
`103`	`109`	`}`
`104`	`110`	`}`
`105`	`111`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace ReactiveUI`
`29`	`29`	`/// This is an View that is both an NSView and has ReactiveObject powers`
`30`	`30`	`/// (i.e. you can call RaiseAndSetIfChanged)`
`31`	`31`	`/// </summary>`
`32`		`- public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate`
	`32`	`+ public class ReactiveView : NSView, IReactiveNotifyPropertyChanged<ReactiveView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation`
`33`	`33`	`{`
`34`	`34`	`protected ReactiveView() : base()`
`35`	`35`	`{`
`@@ -121,5 +121,11 @@ public override void ViewWillMoveToSuperview(NSView newsuper)`
`121`	`121`	`#endif`
`122`	`122`	`RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));`
`123`	`123`	`}`
	`124`	`+`
	`125`	`+ void ICanForceManualActivation.Activate(bool activate)`
	`126`	`+ {`
	`127`	`+ RxApp.MainThreadScheduler.Schedule(() =>`
	`128`	`+ (activate ? activated : deactivated).OnNext(Unit.Default));`
	`129`	`+ }`
`124`	`130`	`}`
`125`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,14 @@ public override void ViewDidAppear(bool animated)`
`95`	`95`	`{`
`96`	`96`	`base.ViewDidAppear(animated);`
`97`	`97`	`activated.OnNext(Unit.Default);`
	`98`	`+ this.ActivateSubviews(true);`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`public override void ViewDidDisappear(bool animated)`
`101`	`102`	`{`
`102`	`103`	`base.ViewDidDisappear(animated);`
`103`	`104`	`deactivated.OnNext(Unit.Default);`
	`105`	`+ this.ActivateSubviews(false);`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,14 @@ public override void ViewDidAppear(bool animated)`
`91`	`91`	`{`
`92`	`92`	`base.ViewDidAppear(animated);`
`93`	`93`	`activated.OnNext(Unit.Default);`
	`94`	`+ this.ActivateSubviews(true);`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`public override void ViewDidDisappear(bool animated)`
`97`	`98`	`{`
`98`	`99`	`base.ViewDidDisappear(animated);`
`99`	`100`	`deactivated.OnNext(Unit.Default);`
	`101`	`+ this.ActivateSubviews(false);`
`100`	`102`	`}`
`101`	`103`	`}`
`102`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,12 +94,14 @@ public override void ViewDidAppear(bool animated)`
`94`	`94`	`{`
`95`	`95`	`base.ViewDidAppear(animated);`
`96`	`96`	`activated.OnNext(Unit.Default);`
	`97`	`+ this.ActivateSubviews(true);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`public override void ViewDidDisappear(bool animated)`
`100`	`101`	`{`
`101`	`102`	`base.ViewDidDisappear(animated);`
`102`	`103`	`deactivated.OnNext(Unit.Default);`
	`104`	`+ this.ActivateSubviews(false);`
`103`	`105`	`}`
`104`	`106`	`}`
`105`	`107`	`}`