From 81548ced6929617b85adc25edf1bc29a0170ba62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 3 Mar 2019 02:22:37 +0100 Subject: [PATCH] native-window-placement: Clarify some code Add some intermediate variables for better legibility. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/60 --- extensions/native-window-placement/extension.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/native-window-placement/extension.js b/extensions/native-window-placement/extension.js index faf7fab5..8a8b0937 100644 --- a/extensions/native-window-placement/extension.js +++ b/extensions/native-window-placement/extension.js @@ -112,10 +112,11 @@ class NaturalLayoutStrategy extends Workspace.LayoutStrategy { overlap = false; for (let i = 0; i < rects.length; i++) { for (let j = 0; j < rects.length; j++) { - if (i != j && rects[i].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS, - WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS) - .overlap(rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS, - WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) { + let adjustments = [-1, -1, 1, 1] + .map(v => v *= WINDOW_PLACEMENT_NATURAL_GAPS); + let iAdjusted = rects[i].adjusted(...adjustments); + let jAdjusted = rects[j].adjusted(...adjustments); + if (i != j && iAdjusted.overlap(jAdjusted)) { loopCounter++; overlap = true;