seems like x11 auto focus prev window after hide

SnosMe · Jan 29, 2020 · b792995 · b792995
1 parent 827df24
commit b792995
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/positioning.ts b/src/main/positioning.ts
@@ -28,7 +28,9 @@ export function setupShowHide () {
 
       if (poeWindowId && isWindowLocked) {
         isWindowLocked = false
-        windowManager.focusWindowById(poeWindowId)
+        if (process.platform === 'win32') {
+          windowManager.focusWindowById(poeWindowId)
+        }
         if (browserViewExternal) {
           win.removeBrowserView(browserViewExternal)
           // uncomment to trade performance for less memory usage (1 process & 13 MB)

diff --git a/src/main/window-manager/LinuxX11.ts b/src/main/window-manager/LinuxX11.ts
@@ -111,7 +111,13 @@ export class LinuxX11 implements IWindowManager {
 
   getActiveWindowId (): Promise<number | null> {
     return new Promise((resolve, reject) => {
-      reject(new Error('Method not implemented.'))
+      this.X.GetProperty(0, this.rootWid, this.USED_ATOMS._NET_ACTIVE_WINDOW, this.USED_ATOMS.WINDOW, 0, 4, (err, prop) => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(decodeWindow(prop.data))
+        }
+      })
     })
   }