Fix swap-window-with-master on multiscreen

kwin-scripts · Apr 5, 2019 · 4a99393 · 4a99393
1 parent d61f73f
commit 4a99393
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/contents/code/tilingmanager.js b/contents/code/tilingmanager.js
@@ -299,16 +299,16 @@ function TilingManager(timer) {
                               "Meta+Shift+M",
                               function() {
                                   try {
-                                      var layout = self.layouts[workspace.currentDesktop - 1][workspace.activeScreen];
-                                      if (layout != null) {
-                                          var client = workspace.activeClient;
-                                          if (client != null) {
-                                              var tile = layout.getTile(client.x, client.y);
+                                      var client = workspace.activeClient;
+                                      if (client != null) {
+                                          var tile = self.tiles.getTile(client);
+                                          if (tile != null) {
+                                              var layout = self.layouts[tile.getDesktop() - 1][tile.getScreen()];
+                                              if (layout != null) {
+                                                  layout.swapTiles(tile, layout.tiles[0]);
+                                              }
                                           }
                                       }
-                                      if (tile != null) {
-                                          layout.swapTiles(tile, layout.tiles[0]);
-                                      }
                                   } catch(err) {
                                       print(err, "in swap-window-with-master");
                                   }