This commit is contained in:
Horis
2025-01-02 22:26:38 +08:00
parent c787ebeb78
commit 5301c70e4d
3 changed files with 10 additions and 9 deletions
@@ -34,7 +34,6 @@ import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.launch
import java.util.LinkedList
import java.util.Locale
import kotlin.coroutines.coroutineContext
import kotlin.math.roundToInt
@@ -339,7 +338,7 @@ class TextChapterLayout(
}
var height = size.height
var width = size.width
when (imageStyle?.uppercase(Locale.ROOT)) {
when (imageStyle?.uppercase()) {
Book.imgStyleFull -> {
width = visibleWidth
height = size.height * visibleWidth / size.width
@@ -487,7 +486,7 @@ class TextChapterLayout(
}
isTitle && textPages.isEmpty() && pendingTextPage.lines.isEmpty() -> {
when (imageStyle?.uppercase(Locale.ROOT)) {
when (imageStyle?.uppercase()) {
Book.imgStyleSingle -> {
val ty = (visibleHeight - layout.lineCount * textHeight) / 2
if (ty > titleTopSpacing) ty else titleTopSpacing.toFloat()
@@ -546,7 +545,8 @@ class TextChapterLayout(
//标题x轴居中
val startX = if (
isTitle &&
(ReadBookConfig.isMiddleTitle || emptyContent || isVolumeTitle || imageStyle == Book.imgStyleSingle)
(ReadBookConfig.isMiddleTitle || emptyContent || isVolumeTitle
|| imageStyle?.uppercase() == Book.imgStyleSingle)
) {
(visibleWidth - desiredWidth) / 2
} else {
@@ -561,7 +561,8 @@ class TextChapterLayout(
else -> {
if (
isTitle &&
(ReadBookConfig.isMiddleTitle || emptyContent || isVolumeTitle || imageStyle == Book.imgStyleSingle)
(ReadBookConfig.isMiddleTitle || emptyContent || isVolumeTitle
|| imageStyle?.uppercase() == Book.imgStyleSingle)
) {
//标题居中
val startX = (visibleWidth - desiredWidth) / 2