|
@@ -40,18 +40,18 @@ extension CPDFView {
|
|
|
@objc func updateAutoFlow() {
|
|
|
self.setDisplay(.singlePage)
|
|
|
let jumpSpace = KMAutoFlowOptionsSheetController.jumpSpace()
|
|
|
- if self.displayMode() == .singlePage || self.displayMode() == .twoUp {
|
|
|
+ if KMPreferenceManager.shared.viewPageDisplayType == .singlePage ||
|
|
|
+ KMPreferenceManager.shared.viewPageDisplayType == .twoUp {
|
|
|
if canGoToNextPage() {
|
|
|
goToNextPage(nil)
|
|
|
} else {
|
|
|
stopAutoFlow()
|
|
|
}
|
|
|
} else {
|
|
|
- if let scrollView = documentView().enclosingScrollView {
|
|
|
+ if let scrollView = documentView() {
|
|
|
let clipView = scrollView.contentView
|
|
|
var newOrigin = clipView.bounds.origin
|
|
|
- newOrigin.y = newOrigin.y - CGFloat(jumpSpace)
|
|
|
-
|
|
|
+ newOrigin.y = newOrigin.y + CGFloat(jumpSpace)
|
|
|
clipView.animator().setBoundsOrigin(newOrigin)
|
|
|
|
|
|
if newOrigin.y <= 0 {
|
|
@@ -139,3 +139,41 @@ extension CPDFView {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+//extension CPDFView {
|
|
|
+// func displayViewMode() -> CPDFDisplayViewMode {
|
|
|
+// var displayViewMode: CPDFDisplayViewMode = .singlePage
|
|
|
+// if self.displayMode() == .singlePage && self.displayDirection == .vertical {
|
|
|
+// displayViewMode = .singlePageContinuous
|
|
|
+// }
|
|
|
+//
|
|
|
+// if self.displayMode() == .twoUp && self.displayDirection == .vertical {
|
|
|
+// displayViewMode = .twoUpContinuous
|
|
|
+// }
|
|
|
+// return displayViewMode
|
|
|
+// }
|
|
|
+//
|
|
|
+// func setDisplayViewMode(mode: CPDFDisplayViewMode) {
|
|
|
+// switch mode {
|
|
|
+// case .twoUpContinuous:
|
|
|
+// self.displayTwoUp = true
|
|
|
+// self.displaysAsBook = false
|
|
|
+// self.displayDirection = .vertical
|
|
|
+// break
|
|
|
+// case .twoUp:
|
|
|
+// self.displayTwoUp = true
|
|
|
+// self.displaysAsBook = false
|
|
|
+// self.displayDirection = .horizontal
|
|
|
+// break
|
|
|
+// case .singlePageContinuous:
|
|
|
+// self.displayTwoUp = false
|
|
|
+// self.displayDirection = .vertical
|
|
|
+// break
|
|
|
+// default:
|
|
|
+// self.displayTwoUp = false
|
|
|
+// self.displayDirection = .horizontal
|
|
|
+// break
|
|
|
+// }
|
|
|
+// }
|
|
|
+//}
|