Update LCManager.swift

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)
     }
@@ -319,6 +308,20 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
     func configureWindow() {
         var windowSceneFound = false
         
+        // Update console cached based on last-cached origin.
+        func updateConsoleOrigin() {
+            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
+            }
+        }
+        
         // Configure console window.
         func fetchWindowScene() {
             let windowScene = UIApplication.shared
@@ -337,11 +340,11 @@ public class LCManager: NSObject, UIGestureRecognizerDelegate {
                 consoleWindow?.addSubview(consoleView)
                 
                 UIWindow.swizzleStatusBarAppearanceOverride
+                
+                updateConsoleOrigin()
             }
         }
         
-        fetchWindowScene()
-        
         /// Ensures the window is configured (i.e. scene has been found). If not, delay and wait for a scene to prepare itself, then try again.
         for i in 1...10 {