From e995412536266e5d895aa9cba73bab7662fe1561 Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Wed, 29 Apr 2026 00:14:28 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E6=9C=AA=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E6=A8=A1=E7=B3=8A=E6=97=B6=EF=BC=8C=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E8=A3=81=E5=88=87=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   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 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 a692bf6e9..6f05876ee 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
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.Scaffold
@@ -15,6 +16,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
 import dev.chrisbanes.haze.HazeState
 import io.legado.app.ui.config.themeConfig.ThemeConfig
 import io.legado.app.ui.theme.LegadoTheme
@@ -42,6 +44,7 @@ fun AppScaffold(
     val hasImageBg = ThemeConfig.hasImageBg(isDark)
     val hazeState = remember { HazeState() }
     val composeEngine = LegadoTheme.composeEngine
+    val contentDrawsBehindBars = ThemeConfig.enableBlur || ThemeConfig.enableProgressiveBlur
 
     val containerColor = if (hasImageBg) {
         Color.Transparent
@@ -81,8 +84,15 @@ fun AppScaffold(
                         modifier = Modifier
                             .fillMaxSize()
                             .responsiveHazeSource(hazeState)
+                            .then(
+                                if (contentDrawsBehindBars) Modifier
+                                else Modifier.padding(paddingValues)
+                            )
                     ) {
-                        content(paddingValues)
+                        content(
+                            if (contentDrawsBehindBars) paddingValues
+                            else PaddingValues(0.dp)
+                        )
                     }
                 }
             }
@@ -105,11 +115,18 @@ fun AppScaffold(
                         modifier = Modifier
                             .fillMaxSize()
                             .responsiveHazeSource(hazeState)
+                            .then(
+                                if (contentDrawsBehindBars) Modifier
+                                else Modifier.padding(paddingValues)
+                            )
                     ) {
-                        content(paddingValues)
+                        content(
+                            if (contentDrawsBehindBars) paddingValues
+                            else PaddingValues(0.dp)
+                        )
                     }
                 }
             }
         }
     }
-}
\ No newline at end of file
+}