From e4487d6c9f0ca2f072bc5674ec1a07039c228538 Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Thu, 14 May 2026 00:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/widget/components/AppScaffold.kt   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/widget/components/AppScaffold.kt b/app/src/main/java/io/legado/app/ui/widget/components/AppScaffold.kt
index 19353acb5..b95f9cf35 100644
--- a/app/src/main/java/io/legado/app/ui/widget/components/AppScaffold.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/components/AppScaffold.kt
@@ -89,18 +89,22 @@ fun AppScaffold(
                         containerColor = miuixContainerColor,
                         contentWindowInsets = contentWindowInsets
                     ) { paddingValues ->
-                        val topPadding = PaddingValues(top = paddingValues.calculateTopPadding())
+                        val scaffoldPadding = if (ThemeConfig.useFloatingBottomBar) {
+                            PaddingValues(top = paddingValues.calculateTopPadding())
+                        } else {
+                            paddingValues
+                        }
                         Box(
                             modifier = Modifier
                                 .fillMaxSize()
                                 .responsiveHazeSource(hazeState)
                                 .then(
                                     if (contentDrawsBehindBars) Modifier
-                                    else Modifier.padding(topPadding)
+                                    else Modifier.padding(scaffoldPadding)
                                 )
                         ) {
                             content(
-                                if (contentDrawsBehindBars) topPadding
+                                if (contentDrawsBehindBars) scaffoldPadding
                                 else PaddingValues(0.dp)
                             )
                         }
@@ -124,18 +128,22 @@ fun AppScaffold(
                         contentColor = contentColor,
                         contentWindowInsets = contentWindowInsets
                     ) { paddingValues ->
-                        val topPadding = PaddingValues(top = paddingValues.calculateTopPadding())
+                        val scaffoldPadding = if (ThemeConfig.useFloatingBottomBar) {
+                            PaddingValues(top = paddingValues.calculateTopPadding())
+                        } else {
+                            paddingValues
+                        }
                         Box(
                             modifier = Modifier
                                 .fillMaxSize()
                                 .responsiveHazeSource(hazeState)
                                 .then(
                                     if (contentDrawsBehindBars) Modifier
-                                    else Modifier.padding(topPadding)
+                                    else Modifier.padding(scaffoldPadding)
                                 )
                         ) {
                             content(
-                                if (contentDrawsBehindBars) topPadding
+                                if (contentDrawsBehindBars) scaffoldPadding
                                 else PaddingValues(0.dp)
                             )
                         }