Merge pull request #6143 from bdach/rounded-corners-android

Include rounded corner radius in android safe area implementation
ppy · Jan 21, 2024 · a5bfffb · a5bfffb
2 parents 3b6ca64 + 471d5e9
commit a5bfffb
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/osu.Framework.Android/AndroidGameView.cs b/osu.Framework.Android/AndroidGameView.cs
@@ -245,6 +245,25 @@ private void updateSafeArea()
                     usableScreenArea = usableScreenArea.Shrink(cutout.SafeInsetLeft, cutout.SafeInsetRight, cutout.SafeInsetTop, cutout.SafeInsetBottom);
             }
 
+            if (OperatingSystem.IsAndroidVersionAtLeast(31) && RootWindowInsets != null)
+            {
+                var topLeftCorner = RootWindowInsets.GetRoundedCorner((int)RoundedCornerPosition.TopLeft);
+                var topRightCorner = RootWindowInsets.GetRoundedCorner((int)RoundedCornerPosition.TopRight);
+                var bottomLeftCorner = RootWindowInsets.GetRoundedCorner((int)RoundedCornerPosition.BottomLeft);
+                var bottomRightCorner = RootWindowInsets.GetRoundedCorner((int)RoundedCornerPosition.BottomRight);
+
+                int cornerInsetLeft = Math.Max(topLeftCorner?.Radius ?? 0, bottomLeftCorner?.Radius ?? 0);
+                int cornerInsetRight = Math.Max(topRightCorner?.Radius ?? 0, bottomRightCorner?.Radius ?? 0);
+                int cornerInsetTop = Math.Max(topLeftCorner?.Radius ?? 0, topRightCorner?.Radius ?? 0);
+                int cornerInsetBottom = Math.Max(bottomLeftCorner?.Radius ?? 0, bottomRightCorner?.Radius ?? 0);
+
+                var radiusInsetArea = screenArea.Width >= screenArea.Height
+                    ? screenArea.Shrink(cornerInsetLeft, cornerInsetRight, 0, 0)
+                    : screenArea.Shrink(0, 0, cornerInsetTop, cornerInsetBottom);
+
+                usableScreenArea = usableScreenArea.Intersect(radiusInsetArea);
+            }
+
             if (OperatingSystem.IsAndroidVersionAtLeast(24) && Activity.IsInMultiWindowMode)
             {
                 // if we are in multi-window mode, the status bar is always visible (even if we request to hide it) and could be obstructing our view.
@@ -257,8 +276,6 @@ private void updateSafeArea()
                 usableScreenArea = usableScreenArea.Intersect(screenArea.Shrink(0, 0, statusBarHeight, 0));
             }
 
-            // TODO: add rounded corners support (Android 12): https://developer.android.com/guide/topics/ui/look-and-feel/rounded-corners
-
             // compute the location/area of this view on the screen.
 
             int[] location = new int[2];