优化
This commit is contained in:
@@ -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,28 +1002,40 @@ object ChapterProvider {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (viewWidth > 0 && viewHeight > 0) {
|
if (viewWidth <= 0 || viewHeight <= 0) {
|
||||||
paddingLeft = ReadBookConfig.paddingLeft.dpToPx()
|
return
|
||||||
paddingTop = ReadBookConfig.paddingTop.dpToPx()
|
|
||||||
paddingRight = ReadBookConfig.paddingRight.dpToPx()
|
|
||||||
paddingBottom = ReadBookConfig.paddingBottom.dpToPx()
|
|
||||||
visibleWidth = if (doublePage) {
|
|
||||||
viewWidth / 2 - paddingLeft - paddingRight
|
|
||||||
} else {
|
|
||||||
viewWidth - paddingLeft - paddingRight
|
|
||||||
}
|
|
||||||
//留1dp画最后一行下划线
|
|
||||||
visibleHeight = viewHeight - paddingTop - paddingBottom
|
|
||||||
visibleRight = viewWidth - paddingRight
|
|
||||||
visibleBottom = paddingTop + visibleHeight
|
|
||||||
}
|
}
|
||||||
|
|
||||||
visibleRect.set(
|
paddingLeft = ReadBookConfig.paddingLeft.dpToPx()
|
||||||
paddingLeft.toFloat(),
|
paddingTop = ReadBookConfig.paddingTop.dpToPx()
|
||||||
paddingTop.toFloat(),
|
paddingRight = ReadBookConfig.paddingRight.dpToPx()
|
||||||
visibleRight.toFloat(),
|
paddingBottom = ReadBookConfig.paddingBottom.dpToPx()
|
||||||
visibleBottom.toFloat()
|
visibleWidth = if (doublePage) {
|
||||||
)
|
viewWidth / 2 - paddingLeft - paddingRight
|
||||||
|
} else {
|
||||||
|
viewWidth - paddingLeft - paddingRight
|
||||||
|
}
|
||||||
|
//留1dp画最后一行下划线
|
||||||
|
visibleHeight = viewHeight - paddingTop - paddingBottom
|
||||||
|
visibleRight = viewWidth - paddingRight
|
||||||
|
visibleBottom = paddingTop + visibleHeight
|
||||||
|
|
||||||
|
if (paddingLeft >= visibleRight || paddingTop >= visibleBottom) {
|
||||||
|
appCtx.toastOnUi("边距设置过大,请重新设置")
|
||||||
|
visibleRect.set(
|
||||||
|
0f,
|
||||||
|
0f,
|
||||||
|
viewWidth.toFloat(),
|
||||||
|
viewHeight.toFloat()
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
visibleRect.set(
|
||||||
|
paddingLeft.toFloat(),
|
||||||
|
paddingTop.toFloat(),
|
||||||
|
visibleRight.toFloat(),
|
||||||
|
visibleBottom.toFloat()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user