fixed some bugs with insertion and added support for inverting insert…

…ion order when autotiling
zeroxoneafour · Mar 20, 2023 · 51b9cb2 · 51b9cb2
1 parent 74154f7
commit 51b9cb2
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 14 deletions.
diff --git a/autotile.kwinscript b/autotile.kwinscript
diff --git a/res/config.ui b/res/config.ui
@@ -64,6 +64,9 @@
       </item>
       <item>
        <widget class="QComboBox" name="kcfg_Borders">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Changes where borders are or aren't&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
         <property name="currentIndex">
          <number>1</number>
         </property>
@@ -92,14 +95,28 @@
      </layout>
     </item>
     <item>
-     <widget class="QCheckBox" name="kcfg_Debug">
-      <property name="toolTip">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spams your user journal&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="text">
-       <string>Debug Mode</string>
-      </property>
-     </widget>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QCheckBox" name="kcfg_InvertInsertion">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Invert the side that windows are inserted into&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Invert insertion</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_Debug">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Spams your user journal&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Debug Mode</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
    </layout>
   </widget>

diff --git a/res/main.xml b/res/main.xml
@@ -7,6 +7,6 @@
         <entry name="TileDialogs" type="bool"><default>false</default></entry>
         <entry name="Debug" type="bool"><default>false</default></entry>
         <entry name="Borders" type="int"><default>1</default></entry>
-        <entry name="RetileWindow" type="string"><default>Meta+Shift+Space</default></entry>
+        <entry name="InvertInsertion" type="bool"><default>false</default></entry>
     </group>
 </kcfg>
diff --git a/src/main.js b/src/main.js
@@ -3,6 +3,7 @@ let useWhitelist;
 let blacklist;
 let tileDialogs;
 let borders;
+let invertInsertion;
 let blacklistCache;
 
 function printDebug(str, isError) {
@@ -19,12 +20,14 @@ let updateConfig = function() {
     blacklist = readConfig("Blacklist", "krunner,yakuake").split(',').map(x => x.trim());
     tileDialogs = readConfig("TileDialogs", false);
     borders = readConfig("Borders", 1);
+    invertInsertion = readConfig("InvertInsertion", false);
     blacklistCache = new Set();
     printDebug("Config Updated", false)
     printDebug("useWhitelist == " + useWhitelist, false);
     printDebug("blacklist == " + blacklist, false);
     printDebug("tileDialogs == " + tileDialogs, false);
     printDebug("borders == " + borders, false);
+    printDebug("invertInsertion == " + invertInsertion, false);
 }
 
 updateConfig();
@@ -220,7 +223,12 @@ function tileClient(client) {
             }
             // check if there is only one window and the tile is binary-splittable
             if (t_windows.length != 0 && t.tiles.length == 2) {
-                targetTile = t.tiles[0];
+                // if the insertion order is inverted, windows will be pushed to the back instead of the front
+                if (invertInsertion) {
+                    targetTile = t.tiles[1];
+                } else {
+                    targetTile = t.tiles[0];
+                }
                 break mainloop;
             }
             stackNext = stackNext.concat(t.tiles);

diff --git a/src/shortcuts.js b/src/shortcuts.js
@@ -77,6 +77,7 @@ let insertAbove = function() {
         return;
     }
     printDebug("Inserting " + client.resourceClass + " above", false);
+    let oldTile = client.tile;
     untileClient(client);
     client.wasTiled = true;
     if (windowsOnDesktop(tile, client.desktop).length != 0) {
@@ -85,7 +86,8 @@ let insertAbove = function() {
     // if tile has no children then don't tile
     if (tile == undefined) {
         printDebug("Could not insert " + client.resourceClass, false);
-        tileClient(client);
+        // now inserts client back into its old tile instead of retiling
+        putClientInTile(client, oldTile);
     }
     putClientInTile(client, tile);
 }
@@ -160,6 +162,7 @@ let insertBelow = function() {
         return;
     }
     printDebug("Inserting " + client.resourceClass + " below", false);
+    let oldTile = client.tile;
     untileClient(client);
     client.wasTiled = true;
     if (windowsOnDesktop(tile, client.desktop).length != 0) {
@@ -168,7 +171,7 @@ let insertBelow = function() {
     // if tile has no children then don't tile
     if (tile == undefined) {
         printDebug("Could not insert " + client.resourceClass, false);
-        tileClient(client);
+        putClientInTile(client, oldTile);
     }
     putClientInTile(client, tile);
 }
@@ -243,6 +246,7 @@ let insertLeft = function() {
         return;
     }
     printDebug("Inserting " + client.resourceClass + " left", false);
+    let oldTile = client.tile;
     untileClient(client);
     client.wasTiled = true;
     if (windowsOnDesktop(tile, client.desktop).length != 0) {
@@ -251,7 +255,7 @@ let insertLeft = function() {
     // if tile has no children then don't tile
     if (tile == undefined) {
         printDebug("Could not insert " + client.resourceClass, false);
-        tileClient(client);
+        putClientInTile(client, oldTile);
     }
     putClientInTile(client, tile);
 }
@@ -326,6 +330,7 @@ let insertRight = function() {
         return;
     }
     printDebug("Inserting " + client.resourceClass + " right", false);
+    let oldTile = client.tile;
     untileClient(client);
     client.wasTiled = true;
     if (windowsOnDesktop(tile, client.desktop).length != 0) {
@@ -334,7 +339,7 @@ let insertRight = function() {
     // if tile has no children then don't tile
     if (tile == undefined) {
         printDebug("Could not insert " + client.resourceClass, false);
-        tileClient(client);
+        putClientInTile(client, oldTile);
     }
     putClientInTile(client, tile);
 }