Merge pull request #170 from Fmstrat/monitor-math

unfixed monitor math
Fmstrat · Sep 7, 2023 · b495473 · b495473
2 parents 042c74c + b506c7a
commit b495473
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/extension.js b/extension.js
@@ -315,18 +315,23 @@ function sendMove(direction, ctrlPressed = false) {
 
     let monitorToLeft = -1;
     let monitorToRight = -1;
+    _log(`sendMove) curMonitor: ${JSON.stringify(curMonitor)}`);
     for (var i = 0; i < Main.layoutManager.monitors.length; i++) {
         if (i === monitorIndex)
             continue;
 
         let testMonitor = getMonitorInfo(i);
-        _log(`sendMove) curMonitor: ${JSON.stringify(curMonitor)}`);
+        let monitorHeightDiff = Math.abs(testMonitor.height - curMonitor.height);
         _log(`sendMove) testMonitor: ${JSON.stringify(testMonitor)}`);
+        _log(`sendMove) monitorsHeightDiff :${monitorHeightDiff}`);
 
-        if (testMonitor.x + testMonitor.width === curMonitor.x)
+        if (testMonitor.x < curMonitor.x &&
+            Math.abs(testMonitor.y - curMonitor.y) < (100 + monitorHeightDiff) &&
+            (monitorToLeft === -1 || (monitorToLeft >= 0 && testMonitor.x > Main.layoutManager.monitors[monitorToLeft].x)))
             monitorToLeft = i;
 
-        if (curMonitor.x + curMonitor.width === testMonitor.x)
+        if (testMonitor.x > curMonitor.x && Math.abs(testMonitor.y - curMonitor.y) < (100 + monitorHeightDiff) &&
+            (monitorToRight === -1 || (monitorToRight >= 0 && testMonitor.x < Main.layoutManager.monitors[monitorToRight].x)))
             monitorToRight = i;
     }
     _log(`sendMove) monitorToLeft: ${monitorToLeft} monitorToRight: ${monitorToRight}`);