marinofaggiana 4 жил өмнө
parent
commit
fa2ec1faf3

+ 4 - 8
iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -578,19 +578,15 @@ extension NCViewerImage: UIPageViewControllerDelegate, UIPageViewControllerDataS
     
     func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
         
-        guard let nextVC = pendingViewControllers.first as? NCViewerImageZoom else {
-            return
-        }
-        
-        self.nextIndex = nextVC.index
+        guard let nextViewController = pendingViewControllers.first as? NCViewerImageZoom else { return }
+        nextIndex = nextViewController.index
     }
     
     func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
         
         if (completed && self.nextIndex != nil) {
-            
-            previousViewControllers.forEach { vc in
-                let viewerImageZoom = vc as! NCViewerImageZoom
+            previousViewControllers.forEach { viewController in
+                let viewerImageZoom = viewController as! NCViewerImageZoom
                 viewerImageZoom.scrollView.zoomScale = viewerImageZoom.scrollView.minimumZoomScale
             }
             currentIndex = nextIndex!

+ 7 - 1
iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -85,7 +85,10 @@ class NCViewerImageZoom: UIViewController {
         }  else {
             statusViewImage.image = nil
             statusLabel.text = ""
-        }        
+        }
+        
+        updateZoomScale()
+        updateConstraints()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -102,6 +105,9 @@ class NCViewerImageZoom: UIViewController {
         detailViewTopConstraint.constant = 0
         detailView.hide()
         
+        updateZoomScale()
+        updateConstraints()
+        
         delegate?.presentImageZoom(viewerImageZoom: self, metadata: metadata)
     }