Support multiple displays when screensHaveSeparateSpaces is false

Hammerspoon · Jul 1, 2022 · 4634b81 · 4634b81
1 parent 6c4f0b5
commit 4634b81
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/extensions/spaces/spaces.lua b/extensions/spaces/spaces.lua
@@ -370,8 +370,11 @@ module.spacesForScreen = function(...)
 
     local screensHaveSeparateSpaces = module.screensHaveSeparateSpaces()
     if not screensHaveSeparateSpaces then
-        if screenID == screen.mainScreen():getUUID() then
-            screenID = "Main"
+        for _,v in ipairs(screen.allScreens()) do
+            if screenID == v:getUUID() then
+                screenID = "Main"
+                break
+            end
         end
     end
 
@@ -458,8 +461,11 @@ module.activeSpaceOnScreen = function(...)
 
     local screensHaveSeparateSpaces = module.screensHaveSeparateSpaces()
     if not screensHaveSeparateSpaces then
-        if screenID == screen.mainScreen():getUUID() then
-            screenID = "Main"
+        for _,v in ipairs(screen.allScreens()) do
+            if screenID == v:getUUID() then
+                screenID = "Main"
+                break
+            end
         end
     end