From e38a0d47ac667fa577f967f2205bbc8fea2bf0e6 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 31 Mar 2021 22:20:17 -0400 Subject: [PATCH] Better handle webtoon SSIV crop border change (cherry picked from commit 7aa379a857c5834996565959905fa0d50c7ca7eb) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt --- .../ui/reader/viewer/webtoon/WebtoonPageHolder.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index 36c43127f..9b77e69d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -363,10 +363,15 @@ class WebtoonPageHolder( private fun initSubsamplingImageView(): SubsamplingScaleImageView { val config = viewer.config - // SY --> - val imageCropBorders = if (!viewer.isContinuous) config.continuousCropBorders else config.imageCropBorders - // SY <-- - if (subsamplingImageView != null && /* SY --> */ imageCropBorders /* SY <-- */ == cropBorders) { + if (subsamplingImageView != null) { + // SY --> + val imageCropBorders = if (!viewer.isContinuous) config.continuousCropBorders else config.imageCropBorders + if (imageCropBorders != cropBorders) { + cropBorders = imageCropBorders + subsamplingImageView!!.setCropBorders(imageCropBorders) + } + // SY <-- + return subsamplingImageView!! }