This commit is contained in:
Horis
2025-06-05 17:59:59 +08:00
parent 2959bdf037
commit 3c1c16a853
@@ -34,6 +34,7 @@ import io.legado.app.utils.postEvent
import io.legado.app.utils.spToPx import io.legado.app.utils.spToPx
import io.legado.app.utils.splitNotBlank import io.legado.app.utils.splitNotBlank
import io.legado.app.utils.textHeight import io.legado.app.utils.textHeight
import io.legado.app.utils.toastOnUi
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import splitties.init.appCtx import splitties.init.appCtx
import java.util.LinkedList import java.util.LinkedList
@@ -1001,7 +1002,10 @@ object ChapterProvider {
} }
} }
if (viewWidth > 0 && viewHeight > 0) { if (viewWidth <= 0 || viewHeight <= 0) {
return
}
paddingLeft = ReadBookConfig.paddingLeft.dpToPx() paddingLeft = ReadBookConfig.paddingLeft.dpToPx()
paddingTop = ReadBookConfig.paddingTop.dpToPx() paddingTop = ReadBookConfig.paddingTop.dpToPx()
paddingRight = ReadBookConfig.paddingRight.dpToPx() paddingRight = ReadBookConfig.paddingRight.dpToPx()
@@ -1015,14 +1019,23 @@ object ChapterProvider {
visibleHeight = viewHeight - paddingTop - paddingBottom visibleHeight = viewHeight - paddingTop - paddingBottom
visibleRight = viewWidth - paddingRight visibleRight = viewWidth - paddingRight
visibleBottom = paddingTop + visibleHeight visibleBottom = paddingTop + visibleHeight
}
if (paddingLeft >= visibleRight || paddingTop >= visibleBottom) {
appCtx.toastOnUi("边距设置过大,请重新设置")
visibleRect.set(
0f,
0f,
viewWidth.toFloat(),
viewHeight.toFloat()
)
} else {
visibleRect.set( visibleRect.set(
paddingLeft.toFloat(), paddingLeft.toFloat(),
paddingTop.toFloat(), paddingTop.toFloat(),
visibleRight.toFloat(), visibleRight.toFloat(),
visibleBottom.toFloat() visibleBottom.toFloat()
) )
}
} }