Add a default for WinRT that follows around the snapped/unsnapped state

reactiveui · May 19, 2013 · 6a8df45 · 6a8df45
1 parent b49893d
commit 6a8df45
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/ReactiveUI.Platforms/Xaml/RoutedViewHost.cs b/ReactiveUI.Platforms/Xaml/RoutedViewHost.cs
@@ -63,23 +63,31 @@ public RoutedViewHost()
 
             if (RxApp.InUnitTestRunner()) return;
 
+#if WINRT
+            ViewContractObservable = Observable.FromEventPattern<SizeChangedEventHandler, SizeChangedEventArgs>(x => SizeChanged += x, x => SizeChanged -= x)
+                .Select(_ => Windows.UI.ViewManagement.ApplicationView.Value)
+                .DistinctUntilChanged()
+                .StartWith(Windows.UI.ViewManagement.ApplicationView.Value))
+                .Select(x => x.ToString());
+#endif
+
             var vmAndContract = Observable.CombineLatest(
                 this.WhenAny(x => x.Router, x => x.Value)
                     .Select(x => x.ViewModelObservable()).Switch(),
                 this.WhenAnyObservable(x => x.ViewContractObservable),
                 (vm, contract) => new { ViewModel = vm, Contract = contract, });
-            
+
             vmAndContract.Subscribe(x => {
-                    if (x.ViewModel == null) {
-                        Content = DefaultContent;
-                        return;
-                    }
+                if (x.ViewModel == null) {
+                    Content = DefaultContent;
+                    return;
+                }
 
-                    var viewLocator = ViewLocator ?? ReactiveUI.ViewLocator.Current;
-                    var view = viewLocator.ResolveView(x.ViewModel, x.Contract);
-                    view.ViewModel = x.ViewModel;
-                    Content = view;
-                }, ex => RxApp.DefaultExceptionHandler.OnNext(ex));
+                var viewLocator = ViewLocator ?? ReactiveUI.ViewLocator.Current;
+                var view = viewLocator.ResolveView(x.ViewModel, x.Contract);
+                view.ViewModel = x.ViewModel;
+                Content = view;
+            }, ex => RxApp.DefaultExceptionHandler.OnNext(ex));
         }
     }
 }
diff --git a/ReactiveUI.Platforms/Xaml/ViewModelViewHost.cs b/ReactiveUI.Platforms/Xaml/ViewModelViewHost.cs
@@ -59,6 +59,14 @@ public ViewModelViewHost()
                 this.WhenAnyObservable(x => x.ViewContractObservable),
                 (vm, contract) => new { ViewModel = vm, Contract = contract, });
 
+#if WINRT
+            ViewContractObservable = Observable.FromEventPattern<SizeChangedEventHandler, SizeChangedEventArgs>(x => SizeChanged += x, x => SizeChanged -= x)
+                .Select(_ => Windows.UI.ViewManagement.ApplicationView.Value)
+                .DistinctUntilChanged()
+                .StartWith(Windows.UI.ViewManagement.ApplicationView.Value))
+                .Select(x => x.ToString());
+#endif
+
             vmAndContract.Subscribe(x => {
                 if (x.ViewModel == null) {
                     Content = DefaultContent;