From fd1114802f73dbc3662ee6cd734fa2333cfae283 Mon Sep 17 00:00:00 2001 From: Duraid Abdul Date: Wed, 1 Sep 2021 18:53:40 -0600 Subject: [PATCH] Update LCManager.swift --- Sources/LocalConsole/LCManager.swift | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Sources/LocalConsole/LCManager.swift b/Sources/LocalConsole/LCManager.swift index b611245..bd41850 100644 --- a/Sources/LocalConsole/LCManager.swift +++ b/Sources/LocalConsole/LCManager.swift @@ -224,12 +224,6 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate { consoleView.layer.shadowRadius = 16 consoleView.layer.shadowOpacity = 0.5 consoleView.layer.shadowOffset = CGSize(width: 0, height: 2) - - let cachedConsolePosition = CGPoint(x: UserDefaults.standard.object(forKey: "LocalConsole_X") as? CGFloat ?? possibleEndpoints.first!.x, - y: UserDefaults.standard.object(forKey: "LocalConsole_Y") as? CGFloat ?? possibleEndpoints.first!.y) - - consoleView.center = nearestTargetTo(cachedConsolePosition, possibleTargets: possibleEndpoints) - consoleView.alpha = 0 consoleView.layer.cornerRadius = 22 @@ -306,11 +300,6 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate { menuButton.showsMenuAsPrimaryAction = true consoleView.addSubview(menuButton) - if consoleView.center.x < 0 || consoleView.center.x > UIScreen.portraitSize.width { - grabberMode = true - scrollLocked = !grabberMode - } - NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil) } @@ -358,6 +347,16 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate { consoleView.layer.removeAllAnimations() isVisible = true } + + let cachedConsolePosition = CGPoint(x: UserDefaults.standard.object(forKey: "LocalConsole_X") as? CGFloat ?? possibleEndpoints.first!.x, + y: UserDefaults.standard.object(forKey: "LocalConsole_Y") as? CGFloat ?? possibleEndpoints.first!.y) + consoleView.center = cachedConsolePosition // Update console center so possibleEndpoints are calculated correctly. + consoleView.center = nearestTargetTo(cachedConsolePosition, possibleTargets: possibleEndpoints) + + if consoleView.center.x < 0 || consoleView.center.x > UIScreen.portraitSize.width { + grabberMode = true + scrollLocked = !grabberMode + } } } }