Merge pull request #340 from Leleat/fix-339

MoveHandler: Ignore unused mods for determining the MoveModes
Leleat · May 15, 2024 · 93f1edc · 93f1edc
2 parents 230efe9 + 0ef6a50
commit 93f1edc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tiling-assistant@leleat-on-github/src/extension/moveHandler.js b/tiling-assistant@leleat-on-github/src/extension/moveHandler.js
@@ -327,13 +327,13 @@ export default class TilingMoveHandler {
         const adaptiveMod = Settings.getInt('move-adaptive-tiling-mod');
         const favMod = Settings.getInt('move-favorite-layout-mod');
         const ignoreTAMod = Settings.getInt('ignore-ta-mod');
-        const noMod = pressed.every(modPressed => !modPressed);
+        const noMod = !pressed[adaptiveMod] && !pressed[ignoreTAMod] && !pressed[ignoreTAMod];
 
-        const useAdaptiveTiling = defaultMode !== MoveModes.ADAPTIVE_TILING && adaptiveMod && pressed[adaptiveMod] ||
+        const useAdaptiveTiling = defaultMode !== MoveModes.ADAPTIVE_TILING && pressed[adaptiveMod] ||
             noMod && defaultMode === MoveModes.ADAPTIVE_TILING;
-        const usefavLayout = defaultMode !== MoveModes.FAVORITE_LAYOUT && favMod && pressed[favMod] ||
+        const usefavLayout = defaultMode !== MoveModes.FAVORITE_LAYOUT && pressed[favMod] ||
             noMod && defaultMode === MoveModes.FAVORITE_LAYOUT;
-        const useIgnoreTa = defaultMode !== MoveModes.IGNORE_TA && ignoreTAMod && pressed[ignoreTAMod] ||
+        const useIgnoreTa = defaultMode !== MoveModes.IGNORE_TA && pressed[ignoreTAMod] ||
             noMod && defaultMode === MoveModes.IGNORE_TA;
 
         let newMode = '';