fixed tapView frame

andreybuksha · Oct 1, 2018 · 4085467 · 4085467
1 parent bea93a2
commit 4085467
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/andrey.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/andrey.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LMCSideMenu.xcodeproj/xcuserdata/andrey.xcuserdatad/xcschemes/xcschememanagement.plist b/LMCSideMenu.xcodeproj/xcuserdata/andrey.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>LMCSideMenu.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/LMCSideMenu/LMCSideMenuCenterControllerProtocol.swift b/LMCSideMenu/LMCSideMenuCenterControllerProtocol.swift
@@ -80,6 +80,7 @@ public extension LMCSideMenuCenterControllerProtocol {
     }
 
     func transitionMenu(to size: CGSize, coordinator: UIViewControllerTransitionCoordinator) {
+        guard interactor.shouldAdjustmenu else { return }
         interactor.prepareForAdjustement()
         coordinator.animate(alongsideTransition: { [weak self] context in
             self?.interactor.adjustMenu(to: size)

diff --git a/LMCSideMenu/MenuPresentAnimator.swift b/LMCSideMenu/MenuPresentAnimator.swift
@@ -67,7 +67,7 @@ extension MenuPresentAnimator: UIViewControllerAnimatedTransitioning {
         if interactor.menuPosition == .left {
             tapViewFrame = CGRect(x: toVc.view.frame.maxX, y: toVc.view.frame.minY, width: tapViewWidth, height: toVc.view.frame.height)
         } else {
-            tapViewFrame = CGRect(x: toVc.view.frame.minX - toVc.view.frame.width, y: toVc.view.frame.minY, width: tapViewWidth, height: toVc.view.frame.height)
+            tapViewFrame = CGRect(x: 0, y: 0, width: tapViewWidth, height: toVc.view.frame.height)
         }
 
         interactor.addTapView(to: containerView, wtih: tapViewFrame)

diff --git a/LMCSideMenu/MenuTransitionInteractor.swift b/LMCSideMenu/MenuTransitionInteractor.swift
@@ -19,6 +19,10 @@ public class MenuTransitionInteractor: UIPercentDrivenInteractiveTransition {
 
     var menuPosition: SideMenuPosition = .left
 
+    public var shouldAdjustmenu: Bool {
+        return leftMenuController?.viewIfLoaded?.window != nil || rightMenuController?.viewIfLoaded?.window != nil
+    }
+
     private weak var tapView: UIView?
 
     override public init() {
@@ -102,15 +106,15 @@ public class MenuTransitionInteractor: UIPercentDrivenInteractiveTransition {
         tapView.frame = tapViewFrame
         blurView?.frame = tapViewFrame
 
-        centerController?.view.frame.size = size
-
         if menuPosition == .right {
             menuView.frame.origin.x = size.width - menuView.frame.width
         }
 
     }
 
     internal func completeAdjusting(to size: CGSize) {
+
+        centerController?.view.frame.size = size
 
         guard let tapView = self.tapView else { return }
         guard let containerView = tapView.superview else { return }