🐛 [Mac] Fix a bug in multi-window applications that did not return to…

… the correct window for pasting (#1253)
CrossPaste · Jun 14, 2024 · 19d1d6d · 19d1d6d
1 parent 41671bb
commit 19d1d6d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/composeApp/src/desktopMain/kotlin/com/clipevery/app/MacAppWindowManager.kt b/composeApp/src/desktopMain/kotlin/com/clipevery/app/MacAppWindowManager.kt
@@ -42,8 +42,8 @@ class MacAppWindowManager(
     }
 
     private fun createMacAppInfo(info: String): MacAppInfo? {
-        val result = info.split(" ", limit = 2)
-        if (result.size > 1) {
+        val result = info.split("\n", limit = 2)
+        if (result.size == 2) {
             val bundleIdentifier = result[0]
             val localizedName = result[1]
             return MacAppInfo(bundleIdentifier, localizedName)

diff --git a/composeApp/src/desktopMain/swift/MacosApi.swift b/composeApp/src/desktopMain/swift/MacosApi.swift
@@ -170,7 +170,13 @@ public func saveAppIcon(bundleIdentifier: UnsafePointer<CChar>, path: UnsafePoin
 }
 
 @_cdecl("bringToBack")
-public func bringToBack(windowTitle: UnsafePointer<CChar>, appName: UnsafePointer<CChar>, toPaste: Bool, keyCodesPointer: UnsafePointer<Int32>, count: Int) {
+public func bringToBack(
+    windowTitle: UnsafePointer<CChar>,
+    appName: UnsafePointer<CChar>,
+    toPaste: Bool,
+    keyCodesPointer: UnsafePointer<Int32>,
+    count: Int
+) {
     DispatchQueue.main.async {
         let title = String(cString: windowTitle)
         let windows = NSApplication.shared.windows
@@ -184,11 +190,8 @@ public func bringToBack(windowTitle: UnsafePointer<CChar>, appName: UnsafePointe
             }
         }
 
-        let appNameString = String(cString: appName)
-        let apps = NSRunningApplication.runningApplications(withBundleIdentifier: appNameString)
-        if let app = apps.first {
-            app.activate(options: [.activateIgnoringOtherApps])
-            if (toPaste) {
+        if (toPaste) {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
                 simulatePasteCommand(keyCodesPointer: keyCodesPointer, count: count)
             }
         }
@@ -199,7 +202,7 @@ public func bringToBack(windowTitle: UnsafePointer<CChar>, appName: UnsafePointe
 public func bringToFront(windowTitle: UnsafePointer<CChar>) -> UnsafePointer<CChar> {
 
     let currentApp = NSWorkspace.shared.frontmostApplication
-    let currentAppInfo = "\(currentApp?.bundleIdentifier ?? "") \(currentApp?.localizedName ?? "")"
+    let currentAppInfo = "\(currentApp?.bundleIdentifier ?? "")\n\(currentApp?.localizedName ?? "")"
 
     DispatchQueue.main.async {
         let title = String(cString: windowTitle)