From df184a2d5b1a15508a5ccc9cb181b36ee3433d37 Mon Sep 17 00:00:00 2001 From: wangmchn Date: Thu, 21 Apr 2016 14:33:11 +0800 Subject: [PATCH] Remove setting --- .gitignore | 1 + .../UserInterfaceState.xcuserstate | Bin 20842 -> 18979 bytes .../WMPageControllerSwiftFramework.xcscheme | 6 +++--- .../PageController/PageController.swift | 20 +++++++++++++----- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8615121..1c39ed8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ DerivedData *.hmap *.ipa *.xcuserstate +*.zip # CocoaPods # diff --git a/WMPageController-Swift.xcodeproj/project.xcworkspace/xcuserdata/Mark.xcuserdatad/UserInterfaceState.xcuserstate b/WMPageController-Swift.xcodeproj/project.xcworkspace/xcuserdata/Mark.xcuserdatad/UserInterfaceState.xcuserstate index 7e196c2bb658a4d44c261809ce97eb8e235fe446..c9b5f09feff1a824c2359e69772b2dd831e7eed5 100644 GIT binary patch delta 7786 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 delta 8246 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 Cb-n-q diff --git a/WMPageController-Swift.xcodeproj/xcshareddata/xcschemes/WMPageControllerSwiftFramework.xcscheme b/WMPageController-Swift.xcodeproj/xcshareddata/xcschemes/WMPageControllerSwiftFramework.xcscheme index 81a32e4..1050907 100644 --- a/WMPageController-Swift.xcodeproj/xcshareddata/xcschemes/WMPageControllerSwiftFramework.xcscheme +++ b/WMPageController-Swift.xcodeproj/xcshareddata/xcschemes/WMPageControllerSwiftFramework.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -64,7 +64,7 @@ diff --git a/WMPageController-Swift/PageController/PageController.swift b/WMPageController-Swift/PageController/PageController.swift index 7d1471d..16a8145 100644 --- a/WMPageController-Swift/PageController/PageController.swift +++ b/WMPageController-Swift/PageController/PageController.swift @@ -96,6 +96,13 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel public lazy var titleColorNormal = UIColor.blackColor() public lazy var menuBGColor = UIColor(red: 244.0/255.0, green: 244.0/255.0, blue: 244.0/255.0, alpha: 1.0) + override public var edgesForExtendedLayout: UIRectEdge { + didSet { + hasInit = false + viewDidLayoutSubviews() + } + } + // MARK: - Private vars private var memoryWarningCount = 0 private var viewHeight: CGFloat = 0.0 @@ -131,8 +138,6 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel override public func viewDidLoad() { super.viewDidLoad() - edgesForExtendedLayout = UIRectEdge.None - UIApplication.sharedApplication().delegate?.window??.backgroundColor = .whiteColor() view.backgroundColor = .whiteColor() guard childControllersCount > 0 else { return } calculateSize() @@ -300,18 +305,23 @@ public class PageController: UIViewController, UIScrollViewDelegate, MenuViewDel } private func calculateSize() { + var navBarHeight = (navigationController != nil) ? CGRectGetMaxY(navigationController!.navigationBar.frame) : 0 + if edgesForExtendedLayout == UIRectEdge.None { + navBarHeight = 0 + } + if viewFrame == CGRectZero { viewWidth = view.frame.size.width - viewHeight = view.frame.size.height - menuHeight + viewHeight = view.frame.size.height - menuHeight - navBarHeight } else { viewWidth = viewFrame.size.width - viewHeight = viewFrame.size.height + viewHeight = viewFrame.size.height - menuHeight } if showOnNavigationBar && (navigationController?.navigationBar != nil) { viewHeight += menuHeight } viewX = viewFrame.origin.x - viewY = viewFrame.origin.y + viewY = viewFrame.origin.y + navBarHeight childViewFrames.removeAll() for index in 0 ..< childControllersCount { let viewControllerFrame = CGRect(x: CGFloat(index) * viewWidth, y: 0, width: viewWidth, height: viewHeight)