From f890a68f35866fcd39af09e2df786d6bc58cb6a0 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 16 Apr 2023 13:10:43 -0400 Subject: [PATCH] Fixes to center margin option (cherry picked from commit d8c2baa135b8cdcac0c00e9b03beeecc132167d6) --- .../tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt | 6 ++++-- .../main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index 27772ccbc..cdbaa04c7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -358,7 +358,9 @@ class PagerPageHolder( private fun mergePages(imageStream: InputStream, imageStream2: InputStream?): InputStream { // Handle adding a center margin to wide images if requested 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.imageCropBorders ) { @@ -440,7 +442,7 @@ class PagerPageHolder( imageStream2.close() 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 { 0 } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt index 594381010..8c226497f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt @@ -201,7 +201,7 @@ object ImageUtil { val height = imageBitmap.height 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 rightSourcePart = Rect(width / 2, 0, width, height)