|
@@ -60,8 +60,8 @@ class AdditionalPageConverter(
|
|
|
/**
|
|
|
* 頁碼轉換,計算第pageIndex頁刪除額外頁面後是原始文件的第幾頁
|
|
|
*/
|
|
|
- fun convertToRawPageIndex(pageIndex: Int): Int {
|
|
|
- if (!shouldApplyAdditionalPage()) return pageIndex
|
|
|
+ fun convertToRawPageIndex(pageIndex: Int, forceIncludeAdditionalPage: Boolean = false): Int {
|
|
|
+ if (!forceIncludeAdditionalPage && !shouldApplyAdditionalPage()) return pageIndex
|
|
|
if (pageIndex < firstAdditionalPageIndex) return pageIndex
|
|
|
return (pageIndex * additionalPageInterval + firstAdditionalPageIndex) / (additionalPageInterval + 1)
|
|
|
}
|
|
@@ -98,7 +98,6 @@ class AdditionalPageConverter(
|
|
|
/**
|
|
|
* 是否套用額外頁面(非垂直閱覽模式則不套用)
|
|
|
*/
|
|
|
-
|
|
|
private fun shouldApplyAdditionalPage(): Boolean {
|
|
|
return isAdditionalPageEnabled.invoke() && isVerticalContinuesViewMode()
|
|
|
}
|