Create Window Specific Orientation Extensions

dotnet · May 19, 2022 · dc2c2ec · dc2c2ec
1 parent 4b833b0
commit dc2c2ec
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 1 deletion.
diff --git a/src/Controls/src/Core/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage.cs
@@ -166,7 +166,7 @@ bool IFlyoutPageController.ShouldShowSplitMode
 					return false;
 
 				FlyoutLayoutBehavior behavior = FlyoutLayoutBehavior;
-				var orientation = DeviceDisplay.MainDisplayInfo.Orientation;
+				var orientation = this.Window?.GetOrientation() ?? DisplayOrientation.Unknown;
 
 				bool isSplitOnLandscape = (behavior == FlyoutLayoutBehavior.SplitOnLandscape || behavior == FlyoutLayoutBehavior.Default) && orientation.IsLandscape();
 				bool isSplitOnPortrait = behavior == FlyoutLayoutBehavior.SplitOnPortrait && orientation.IsPortrait();

diff --git a/src/Core/src/Platform/Android/WindowExtensions.cs b/src/Core/src/Platform/Android/WindowExtensions.cs
@@ -0,0 +1,19 @@
+using Android.App;
+using Android.Content.Res;
+using Microsoft.Maui.Devices;
+using Microsoft.Maui.Platform;
+
+namespace Microsoft.Maui
+{
+	public static partial class WindowExtensions
+	{
+		internal static DisplayOrientation GetOrientation(this IWindow window) =>
+			window.Handler?.MauiContext?.GetPlatformWindow()?.Resources?.Configuration?.Orientation switch
+			{
+				Orientation.Landscape => DisplayOrientation.Landscape,
+				Orientation.Portrait => DisplayOrientation.Portrait,
+				Orientation.Square => DisplayOrientation.Portrait,
+				_ => DisplayOrientation.Unknown
+			};
+	}
+}
diff --git a/src/Core/src/Platform/Standard/WindowExtensions.cs b/src/Core/src/Platform/Standard/WindowExtensions.cs
@@ -0,0 +1,10 @@
+using Microsoft.Maui.Devices;
+
+namespace Microsoft.Maui
+{
+	public static partial class WindowExtensions
+	{
+		internal static DisplayOrientation GetOrientation(this IWindow window) =>
+			DisplayOrientation.Unknown;
+	}
+}
diff --git a/src/Core/src/Platform/Tizen/WindowExtensions.cs b/src/Core/src/Platform/Tizen/WindowExtensions.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using ElmSharp;
+using Microsoft.Maui.ApplicationModel;
 using Tizen.UIExtensions.Common;
 using Tizen.UIExtensions.ElmSharp;
 using ELayout = ElmSharp.Layout;
@@ -110,5 +111,19 @@ static void OnBackButtonPressed(Window window)
 				s_windowCloseRequestHandler[window].Invoke();
 		}
 
+		internal static Devices.DisplayOrientation GetOrientation(this IWindow window)
+		{
+			int displayWidth = PlatformUtils.GetFeatureInfo<int>("screen.width");
+			int displayHeight = PlatformUtils.GetFeatureInfo<int>("screen.height");
+
+			if (displayHeight >= displayWidth)
+			{
+				return Devices.DisplayOrientation.Portrait;
+			}
+			else
+			{
+				return Devices.DisplayOrientation.Landscape;
+			}
+		}
 	}
 }
diff --git a/src/Core/src/Platform/Windows/WindowExtensions.cs b/src/Core/src/Platform/Windows/WindowExtensions.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Media;
 using WinRT.Interop;
+using Windows.Graphics.Display;
 
 namespace Microsoft.Maui.Platform
 {
@@ -60,5 +61,25 @@ public static float GetDisplayDensity(this UI.Xaml.Window platformWindow)
 			var windowId = UI.Win32Interop.GetWindowIdFromWindow(hwnd);
 			return UI.Windowing.AppWindow.GetFromWindowId(windowId);
 		}
+
+		internal static DisplayOrientation GetOrientation(this IWindow window)
+		{
+			var appWindow = window.Handler?.MauiContext?.GetPlatformWindow()?.GetAppWindow();
+
+			if (appWindow == null)
+				return DisplayOrientation.Unknown;
+
+			DisplayOrientations orientationEnum;
+			int theScreenWidth = appWindow.Size.Width;
+			int theScreenHeight = appWindow.Size.Height;
+			if (theScreenWidth > theScreenHeight)
+				orientationEnum = DisplayOrientations.Landscape;
+			else
+				orientationEnum = DisplayOrientations.Portrait;
+
+			return orientationEnum == DisplayOrientations.Landscape
+				? DisplayOrientation.Landscape
+				: DisplayOrientation.Portrait;
+		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/WindowExtensions.cs b/src/Core/src/Platform/iOS/WindowExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Maui.Devices;
 using UIKit;
 
 namespace Microsoft.Maui.Platform
@@ -29,5 +30,12 @@ public static partial class WindowExtensions
 
 		public static float GetDisplayDensity(this UIWindow uiWindow) =>
 			(float)(uiWindow.Screen?.Scale ?? new nfloat(1.0f));
+
+#pragma warning disable CA1416 // UIApplication.StatusBarOrientation has [UnsupportedOSPlatform("ios9.0")]. (Deprecated but still works)
+		internal static DisplayOrientation GetOrientation(this IWindow window) =>
+			UIApplication.SharedApplication.StatusBarOrientation.IsLandscape()
+				? DisplayOrientation.Landscape
+				: DisplayOrientation.Portrait;
+#pragma warning restore CA1416
 	}
 }