Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to center margin option

Browse Source
This commit is contained in:
Jobobby04 2023-04-16 13:10:43 -04:00
parent 7155b2be10
commit d8c2baa135
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
View File

@ -245,7 +245,9 @@ class PagerPageHolder(
private fun mergePages(imageStream: InputStream, imageStream2: InputStream?): InputStream { private fun mergePages(imageStream: InputStream, imageStream2: InputStream?): InputStream {
// Handle adding a center margin to wide images if requested // Handle adding a center margin to wide images if requested
if (imageStream2 == null) { if (imageStream2 == null) {
return if (imageStream is BufferedInputStream && ImageUtil.isWideImage(imageStream) && return if (imageStream is BufferedInputStream &&
!ImageUtil.isAnimatedAndSupported(imageStream) &&
ImageUtil.isWideImage(imageStream) &&
viewer.config.centerMarginType and PagerConfig.CenterMarginType.WIDE_PAGE_CENTER_MARGIN > 0 && viewer.config.centerMarginType and PagerConfig.CenterMarginType.WIDE_PAGE_CENTER_MARGIN > 0 &&
!viewer.config.imageCropBorders !viewer.config.imageCropBorders
) { ) {
@ -327,7 +329,7 @@ class PagerPageHolder(
imageStream2.close() imageStream2.close()
val centerMargin = if (viewer.config.centerMarginType and PagerConfig.CenterMarginType.DOUBLE_PAGE_CENTER_MARGIN > 0 && !viewer.config.imageCropBorders) { val centerMargin = if (viewer.config.centerMarginType and PagerConfig.CenterMarginType.DOUBLE_PAGE_CENTER_MARGIN > 0 && !viewer.config.imageCropBorders) {
96 / (getHeight().coerceAtLeast(1) / max(height, height2).coerceAtLeast(1)).coerceAtLeast(1) 96 / (this.height.coerceAtLeast(1) / max(height, height2).coerceAtLeast(1)).coerceAtLeast(1)
} else { } else {
0 0
} }

2
core/src/main/java/tachiyomi/core/util/system/ImageUtil.kt
View File

@ -220,7 +220,7 @@ object ImageUtil {
val height = imageBitmap.height val height = imageBitmap.height
val width = imageBitmap.width val width = imageBitmap.width
val centerPadding = 96 / (max(1, viewHeight) / height) val centerPadding = 96 / (max(1, viewHeight) / height).coerceAtLeast(1)
val leftSourcePart = Rect(0, 0, width / 2, height) val leftSourcePart = Rect(0, 0, width / 2, height)
val rightSourcePart = Rect(width / 2, 0, width, height) val rightSourcePart = Rect(width / 2, 0, width, height)