修改防止越界

kFoodie · Jan 19, 2016 · d09b4a0 · d09b4a0
1 parent 626c33e
commit d09b4a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/...roj/project.xcworkspace/xcuserdata/zhengguokai.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/zhengguokai.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TestPageViewController/FECustomPageViewController.swift b/TestPageViewController/FECustomPageViewController.swift
@@ -386,10 +386,18 @@ class FECustomPageViewController: UIViewController, UIPageViewControllerDelegate
             zoomRect.origin.x = scrollView.frame.width - zoomRect.size.width
         }
 
+        if zoomRect.origin.x < 0 {
+            zoomRect.origin.x = 0
+        }
+
         if zoomRect.origin.y + zoomRect.size.height > scrollView.frame.height {
             zoomRect.origin.y = scrollView.frame.height - zoomRect.size.height
         }
 
+        if zoomRect.origin.y < 0 {
+            zoomRect.origin.y = 0
+        }
+
         return zoomRect
 
     }

diff --git a/TestPageViewController/ViewController.swift b/TestPageViewController/ViewController.swift
@@ -26,10 +26,9 @@ class ViewController: UIViewController {
 
         let pageController = FECustomPageViewController()
 
-//        pageController.imageType = .ImageTypeCarousel
         pageController.list_image = [UIImage(named: "guide_page_one")!, UIImage(named: "guide_page_two")!, UIImage(named: "guide_page_three")!, UIImage(named: "1.pic.jpg")!]
 
-        pageController.imageType = .ImageTypeCarousel
+//        pageController.imageType = .ImageTypeCarousel
 
         pageController.tapHandler = {
             print("hello")