修复首页在 macos 小屏的 window insets

open-ani · Nov 10, 2024 · aa89da5 · aa89da5
1 parent 8b4b3a7
commit aa89da5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/shared/src/commonMain/kotlin/ui/main/MainScene.kt b/app/shared/src/commonMain/kotlin/ui/main/MainScene.kt
@@ -15,6 +15,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
@@ -60,6 +61,7 @@ import me.him188.ani.app.ui.foundation.LocalPlatform
 import me.him188.ani.app.ui.foundation.animation.SharedTransitionKeys
 import me.him188.ani.app.ui.foundation.ifThen
 import me.him188.ani.app.ui.foundation.layout.LocalPlatformWindow
+import me.him188.ani.app.ui.foundation.layout.desktopTitleBar
 import me.him188.ani.app.ui.foundation.layout.desktopTitleBarPadding
 import me.him188.ani.app.ui.foundation.layout.isAtLeastMedium
 import me.him188.ani.app.ui.foundation.layout.setRequestFullScreen
@@ -152,7 +154,13 @@ private fun MainSceneContent(
                 fadeIn(snap()) togetherWith fadeOut(snap())
             },
         ) { page ->
-            TabContent(layoutType = navigationLayoutType) {
+            TabContent(
+                layoutType = navigationLayoutType,
+                Modifier.ifThen(navigationLayoutType != NavigationSuiteType.NavigationBar) {
+                    // macos 标题栏只会在 NavigationRail 的区域内, TabContent 区域无需这些 padding.
+                    consumeWindowInsets(WindowInsets.desktopTitleBar())
+                },
+            ) {
                 when (page) {
                     MainScenePage.Exploration -> {
                         ExplorationPage(

diff --git a/app/shared/ui-foundation/src/commonMain/kotlin/ui/foundation/layout/PlatformWindow.kt b/app/shared/ui-foundation/src/commonMain/kotlin/ui/foundation/layout/PlatformWindow.kt
@@ -128,8 +128,7 @@ object AniWindowInsets {
      * 如果 TopAppBar 不会接触窗口左上角, 就使用这个.
      */
     @Composable
-    inline fun forTopAppBarWithoutDesktopTitle() = (WindowInsets.systemBars.union(WindowInsets.displayCutout))
-        .only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal) // 要加上 displayCutout 因为刘海可能会挡住横屏状态下的状态栏返回键
+    inline fun forTopAppBarWithoutDesktopTitle() = forTopAppBar()// 要加上 displayCutout 因为刘海可能会挡住横屏状态下的状态栏返回键
 
     /**
      * 包含 macOS 标题栏