让 NavigationRail 区域也 WindowDraggable (#997)

open-ani · Sep 23, 2024 · 9de0f93 · 9de0f93
1 parent 235d8a1
commit 9de0f93
Showing 1 changed file with 59 additions and 56 deletions.
diff --git a/app/shared/src/commonMain/kotlin/ui/main/HomeScene.kt b/app/shared/src/commonMain/kotlin/ui/main/HomeScene.kt
@@ -73,6 +73,7 @@ import me.him188.ani.app.ui.cache.CacheManagementViewModel
 import me.him188.ani.app.ui.external.placeholder.placeholder
 import me.him188.ani.app.ui.foundation.LocalPlatform
 import me.him188.ani.app.ui.foundation.avatar.AvatarImage
+import me.him188.ani.app.ui.foundation.interaction.WindowDragArea
 import me.him188.ani.app.ui.foundation.layout.LocalPlatformWindow
 import me.him188.ani.app.ui.foundation.layout.isWidthAtLeastMedium
 import me.him188.ani.app.ui.foundation.layout.setRequestFullScreen
@@ -187,66 +188,68 @@ private fun HomeSceneLandscape(
         },
     ) {
         Row(modifier.background(AniThemeDefaults.navigationContainerColor)) {
-            // NavigationRail 宽度至少为 80.dp, 没有 horizontal padding
-            NavigationRail(
-                Modifier.fillMaxHeight(),
-                header = { UserAvatarInNavigation() },
-                windowInsets = windowInsets.only(WindowInsetsSides.Vertical + WindowInsetsSides.Start)
-                    .add(WindowInsets(top = 16.dp)), // 稍微多一点好看点
-                containerColor = AniThemeDefaults.navigationContainerColor,
-                contentColor = contentColorFor(AniThemeDefaults.navigationContainerColor),
-            ) {
-                Column(
-                    Modifier
-                        .padding(bottom = 16.dp)
-                        .fillMaxHeight(),
-                    verticalArrangement = Arrangement.spacedBy(16.dp),
+            WindowDragArea {
+                // NavigationRail 宽度至少为 80.dp, 没有 horizontal padding
+                NavigationRail(
+                    Modifier.fillMaxHeight(),
+                    header = { UserAvatarInNavigation() },
+                    windowInsets = windowInsets.only(WindowInsetsSides.Vertical + WindowInsetsSides.Start)
+                        .add(WindowInsets(top = 16.dp)), // 稍微多一点好看点
+                    containerColor = AniThemeDefaults.navigationContainerColor,
+                    contentColor = contentColorFor(AniThemeDefaults.navigationContainerColor),
                 ) {
-                    NavigationRailItem(
-                        pagerState.currentPage == 0,
-                        onClick = {
-                            uiScope.launch {
-                                pagerState.scrollToPage(0)
-                            }
-                        },
-                        icon = { Icon(Icons.Rounded.TravelExplore, null) },
-                        label = { Text(text = "找番") },
-                    )
-                    NavigationRailItem(
-                        pagerState.currentPage == 1,
-                        onClick = {
-                            uiScope.launch {
-                                pagerState.scrollToPage(1)
-                            }
-                        },
-                        icon = { Icon(Icons.Rounded.Star, null) },
-                        label = { Text(text = "追番") },
-                    )
-                    NavigationRailItem(
-                        pagerState.currentPage == 2,
-                        onClick = {
-                            uiScope.launch {
-                                pagerState.scrollToPage(2)
-                            }
-                        },
-                        icon = { Icon(Icons.Rounded.DownloadDone, null) },
-                        label = { Text(text = "缓存") },
-                    )
+                    Column(
+                        Modifier
+                            .padding(bottom = 16.dp)
+                            .fillMaxHeight(),
+                        verticalArrangement = Arrangement.spacedBy(16.dp),
+                    ) {
+                        NavigationRailItem(
+                            pagerState.currentPage == 0,
+                            onClick = {
+                                uiScope.launch {
+                                    pagerState.scrollToPage(0)
+                                }
+                            },
+                            icon = { Icon(Icons.Rounded.TravelExplore, null) },
+                            label = { Text(text = "找番") },
+                        )
+                        NavigationRailItem(
+                            pagerState.currentPage == 1,
+                            onClick = {
+                                uiScope.launch {
+                                    pagerState.scrollToPage(1)
+                                }
+                            },
+                            icon = { Icon(Icons.Rounded.Star, null) },
+                            label = { Text(text = "追番") },
+                        )
+                        NavigationRailItem(
+                            pagerState.currentPage == 2,
+                            onClick = {
+                                uiScope.launch {
+                                    pagerState.scrollToPage(2)
+                                }
+                            },
+                            icon = { Icon(Icons.Rounded.DownloadDone, null) },
+                            label = { Text(text = "缓存") },
+                        )
 
-                    UpdateCheckerItem()
+                        UpdateCheckerItem()
 
-                    Spacer(Modifier.weight(1f))
+                        Spacer(Modifier.weight(1f))
 
-                    NavigationRailItem(
-                        pagerState.currentPage == 3,
-                        onClick = {
-                            uiScope.launch {
-                                pagerState.scrollToPage(3)
-                            }
-                        },
-                        icon = { Icon(Icons.Rounded.Settings, null) },
-                        label = { Text(text = "设置") },
-                    )
+                        NavigationRailItem(
+                            pagerState.currentPage == 3,
+                            onClick = {
+                                uiScope.launch {
+                                    pagerState.scrollToPage(3)
+                                }
+                            },
+                            icon = { Icon(Icons.Rounded.Settings, null) },
+                            label = { Text(text = "设置") },
+                        )
+                    }
                 }
             }
             VerticalDivider()