fixed focus issue

twocanoes · Apr 18, 2023 · e3c87a5 · e3c87a5
1 parent 534be3e
commit e3c87a5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/XCreds Login Overlay/AppDelegate.swift b/XCreds Login Overlay/AppDelegate.swift
@@ -69,26 +69,29 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
  */
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        if AuthorizationDBManager.shared.rightExists(right: "loginwindow:login") == true {
+
+            var statusWindowRect=window.frame
+            let screenRect = NSScreen.screens[0].visibleFrame
+            statusWindowRect.size.width=screenRect.size.width
+            statusWindowRect.origin=screenRect.origin;
+            window.setFrame(statusWindowRect, display: true, animate: false)
+            window.canBecomeVisibleWithoutLogin=true
+            window.hidesOnDeactivate=false
+            window.isOpaque=false
+            window.level = .modalPanel
+            //        Timer.scheduledTimer(withTimeInterval: 3, repeats: true) { timer in
+            //            NSApp.activate(ignoringOtherApps: true)
+            //            self.window.orderFrontRegardless()
+            //        }
+
+            NSApp.activate(ignoringOtherApps: true)
+            window.orderFrontRegardless()
+            if let ud = UserDefaults(suiteName: "com.twocanoes.xcreds"),  let customTextString = ud.value(forKey: "cloudLoginText") {
+                cloudLoginTextField.stringValue = customTextString as! String
+                cloudLoginTextField.sizeToFit()
 
-        var statusWindowRect=window.frame
-        let screenRect = NSScreen.screens[0].visibleFrame
-        statusWindowRect.size.width=screenRect.size.width
-        statusWindowRect.origin=screenRect.origin;
-        window.setFrame(statusWindowRect, display: true, animate: false)
-        window.canBecomeVisibleWithoutLogin=true
-        window.hidesOnDeactivate=false
-        window.isOpaque=false
-        window.level = .modalPanel
-//        Timer.scheduledTimer(withTimeInterval: 3, repeats: true) { timer in
-//            NSApp.activate(ignoringOtherApps: true)
-//            self.window.orderFrontRegardless()
-//        }
-        NSApp.activate(ignoringOtherApps: true)
-        window.orderFrontRegardless()
-        if let ud = UserDefaults(suiteName: "com.twocanoes.xcreds"),  let customTextString = ud.value(forKey: "cloudLoginText") {
-            cloudLoginTextField.stringValue = customTextString as! String
-            cloudLoginTextField.sizeToFit()
-
+            }
         }
     }
 

diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -1005,7 +1005,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3605;
+				CURRENT_PROJECT_VERSION = 3607;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1042,7 +1042,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3605;
+				CURRENT_PROJECT_VERSION = 3607;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1107,7 +1107,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3605;
+				CURRENT_PROJECT_VERSION = 3607;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1143,7 +1143,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3605;
+				CURRENT_PROJECT_VERSION = 3607;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1292,7 +1292,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3605;
+				CURRENT_PROJECT_VERSION = 3607;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1327,7 +1327,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3605;
+				CURRENT_PROJECT_VERSION = 3607;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate