diff options
Diffstat (limited to 'Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs')
-rw-r--r-- | Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs index 595de47d..50957746 100644 --- a/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs @@ -7,7 +7,6 @@ using AppKit; using CoreAnimation; using Foundation; using Xamarin.Forms.Internals; -using Xamarin.Forms.PlatformConfiguration.macOSSpecific; namespace Xamarin.Forms.Platform.MacOS { @@ -264,30 +263,6 @@ namespace Xamarin.Forms.Platform.MacOS } } - NSViewControllerTransitionOptions ToViewControllerTransitionOptions(NavigationTransitionStyle transitionStyle) - { - switch (transitionStyle) - { - case NavigationTransitionStyle.Crossfade: - return NSViewControllerTransitionOptions.Crossfade; - case NavigationTransitionStyle.SlideBackward: - return NSViewControllerTransitionOptions.SlideBackward; - case NavigationTransitionStyle.SlideDown: - return NSViewControllerTransitionOptions.SlideDown; - case NavigationTransitionStyle.SlideForward: - return NSViewControllerTransitionOptions.SlideForward; - case NavigationTransitionStyle.SlideLeft: - return NSViewControllerTransitionOptions.SlideLeft; - case NavigationTransitionStyle.SlideRight: - return NSViewControllerTransitionOptions.SlideRight; - case NavigationTransitionStyle.SlideUp: - return NSViewControllerTransitionOptions.SlideUp; - - default: - return NSViewControllerTransitionOptions.None; - } - } - async Task<bool> PopPageAsync(Page page, bool animated) { if (page == null) @@ -306,10 +281,8 @@ namespace Xamarin.Forms.Platform.MacOS if (animated) { var previousPageRenderer = Platform.GetRenderer(previousPage); - var transitionStyle = NavigationPage.OnThisPlatform().GetNavigationTransitionPopStyle(); - return await this.HandleAsyncAnimation(target.ViewController, previousPageRenderer.ViewController, - ToViewControllerTransitionOptions(transitionStyle), () => Platform.DisposeRendererAndChildren(target), true); + NSViewControllerTransitionOptions.SlideBackward, () => Platform.DisposeRendererAndChildren(target), true); } RemovePage(page, false); @@ -340,10 +313,8 @@ namespace Xamarin.Forms.Platform.MacOS } var vco = Platform.GetRenderer(oldPage); AddChildViewController(vc.ViewController); - - var transitionStyle = NavigationPage.OnThisPlatform().GetNavigationTransitionPushStyle(); return await this.HandleAsyncAnimation(vco.ViewController, vc.ViewController, - ToViewControllerTransitionOptions(transitionStyle), () => page?.SendAppearing(), true); + NSViewControllerTransitionOptions.SlideForward, () => page?.SendAppearing(), true); } void UpdateBackgroundColor() |