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

Recreate webtoon SSIV when crop borders setting changes (fixes #4734)

Browse Source 
(cherry picked from commit 407e798fdbfb46f48f29aeb0c5930b8cd4415e28)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
This commit is contained in:
arkon 2021-03-30 18:47:44 -04:00 committed by Jobobby04
parent fb01b547de
commit b2cf1266ba
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
View File

@ -66,6 +66,7 @@ class WebtoonPageHolder(
* Image view that supports subsampling on zoom. * Image view that supports subsampling on zoom.
*/ */
private var subsamplingImageView: SubsamplingScaleImageView? = null private var subsamplingImageView: SubsamplingScaleImageView? = null
private var cropBorders: Boolean = false
/** /**
* Simple image view only used on GIFs. * Simple image view only used on GIFs.
@ -360,17 +361,23 @@ class WebtoonPageHolder(
* Initializes a subsampling scale view. * Initializes a subsampling scale view.
*/ */
private fun initSubsamplingImageView(): SubsamplingScaleImageView { private fun initSubsamplingImageView(): SubsamplingScaleImageView {
if (subsamplingImageView != null) return subsamplingImageView!!
val config = viewer.config val config = viewer.config
// SY -->
val imageCropBorders = if (!viewer.isContinuous) config.continuesCropBorders else config.imageCropBorders
// SY <--
if (subsamplingImageView != null && /* SY --> */ imageCropBorders /* SY <-- */ == cropBorders) {
return subsamplingImageView!!
}
cropBorders = /* SY --> */ imageCropBorders /* SY <-- */
subsamplingImageView = WebtoonSubsamplingImageView(context).apply { subsamplingImageView = WebtoonSubsamplingImageView(context).apply {
setMaxTileSize(viewer.activity.maxBitmapSize) setMaxTileSize(viewer.activity.maxBitmapSize)
setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE) setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE)
setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH) setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH)
setMinimumDpi(90) setMinimumDpi(90)
setMinimumTileDpi(180) setMinimumTileDpi(180)
setCropBorders(/* SY --> */ if (!viewer.isContinuous) config.continuesCropBorders else /* SY <-- */ config.imageCropBorders) setCropBorders(cropBorders)
setOnImageEventListener( setOnImageEventListener(
object : SubsamplingScaleImageView.DefaultOnImageEventListener() { object : SubsamplingScaleImageView.DefaultOnImageEventListener() {
override fun onReady() { override fun onReady() {