Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f5b6615c72 | |||
| 8804675b80 | |||
| b0a09a5b7d | |||
| f1e4efeb46 |
@@ -89,7 +89,7 @@ class MainViewController: UIViewController {
|
||||
|
||||
var settings = SideMenuSettings()
|
||||
settings.presentationStyle = presentationStyle
|
||||
settings.menuWidth = view.frame.width * CGFloat(screenWidthSlider.value)
|
||||
settings.menuWidth = min(view.frame.width, view.frame.height) * CGFloat(screenWidthSlider.value)
|
||||
let styles:[UIBlurEffect.Style?] = [nil, .dark, .light, .extraLight]
|
||||
settings.blurEffectStyle = styles[blurSegmentControl.selectedSegmentIndex]
|
||||
settings.statusBarEndAlpha = blackOutStatusBar.isOn ? 1 : 0
|
||||
|
||||
@@ -166,12 +166,12 @@ open class UISideMenuNavigationController: UINavigationController {
|
||||
|
||||
// When presenting a view controller from the menu, the menu view gets moved into another transition view above our transition container
|
||||
// which can break the visual layout we had before. So, we move the menu view back to its original transition view to preserve it.
|
||||
if let presentingView = presentingViewController?.view, let containerView = presentingView.superview {
|
||||
containerView.addSubview(view)
|
||||
}
|
||||
|
||||
if dismissOnPresent && !isBeingDismissed {
|
||||
// We're presenting a view controller from the menu, so we need to hide the menu so it isn't showing when the presented view is dismissed.
|
||||
if let presentingView = presentingViewController?.view, let containerView = presentingView.superview {
|
||||
containerView.addSubview(view)
|
||||
}
|
||||
|
||||
transitionController?.transition(presenting: false, animated: animated, alongsideTransition: { [weak self] in
|
||||
guard let self = self else { return }
|
||||
self.activeDelegate?.sideMenuWillDisappear?(menu: self, animated: animated)
|
||||
@@ -206,11 +206,11 @@ open class UISideMenuNavigationController: UINavigationController {
|
||||
|
||||
activeDelegate?.sideMenuDidDisappear?(menu: self, animated: animated)
|
||||
|
||||
if dismissOnPresent && !isBeingDismissed {
|
||||
view.isHidden = true
|
||||
} else {
|
||||
if isBeingDismissed {
|
||||
transitionController = nil
|
||||
interactive = false
|
||||
} else if dismissOnPresent {
|
||||
view.isHidden = true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -237,6 +237,11 @@ open class UISideMenuNavigationController: UINavigationController {
|
||||
self.rotating = false
|
||||
}
|
||||
}
|
||||
|
||||
open override func viewWillLayoutSubviews() {
|
||||
super.viewWillLayoutSubviews()
|
||||
transitionController?.layout()
|
||||
}
|
||||
|
||||
override open func pushViewController(_ viewController: UIViewController, animated: Bool) {
|
||||
let push = shouldPushViewController(viewController: viewController, animated: animated) { [weak self] _ in
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "SideMenu"
|
||||
s.version = "6.0.6"
|
||||
s.version = "6.0.7"
|
||||
s.summary = "Simple side menu control for iOS in Swift inspired by Facebook. Right and Left sides. No coding required."
|
||||
|
||||
# This description is used to generate tags and improve search results.
|
||||
|
||||
Reference in New Issue
Block a user