Add "auto unstack" switch

Author: MeowcaTheoRange

.prettierignore

@@ -0,0 +1 @@
+**

schemas/org.gnome.shell.extensions.pop-shell.gschema.xml

@@ -64,6 +64,11 @@
             <summary>Hide the outer gap when a tree contains only one window</summary>
         </key>
 
+        <key type="b" name="auto-unstack">
+            <default>false</default>
+            <summary>Destroy a window stack when it contains only one window</summary>
+        </key>
+
         <key type="b" name="snap-to-grid">
             <default>false</default>
             <summary>Snaps windows to the tiling grid on drop</summary>

src/auto_tiler.ts

@@ -1,12 +1,12 @@
 const Me = imports.misc.extensionUtils.getCurrentExtension();
 
 import * as ecs from 'ecs';
+import * as geom from 'geom';
 import * as lib from 'lib';
 import * as log from 'log';
 import * as node from 'node';
 import * as result from 'result';
 import * as stack from 'stack';
-import * as geom from 'geom';
 import * as tiling from 'tiling';
 
 import type { Entity } from 'ecs';
@@ -232,9 +232,9 @@ export class AutoTiler {
     }
 
     /** Detaches the window from a tiling branch, if it is attached to one. */
-    detach_window(ext: Ext, win: Entity) {
+    detach_window(ext: Ext, win: Entity, destroy_stack: boolean = true) {
         this.attached.take_with(win, (prev_fork: Entity) => {
-            const reflow_fork = this.forest.detach(ext, prev_fork, win);
+            const reflow_fork = this.forest.detach(ext, prev_fork, win, destroy_stack);
 
             if (reflow_fork) {
                 const fork = reflow_fork[1];

src/forest.ts

@@ -3,19 +3,19 @@ const Me = imports.misc.extensionUtils.getCurrentExtension();
 
 import * as arena from 'arena';
 import * as Ecs from 'ecs';
+import * as Fork from 'fork';
+import * as geom from 'geom';
 import * as Lib from 'lib';
 import * as log from 'log';
 import * as movement from 'movement';
-import * as Rect from 'rectangle';
 import * as Node from 'node';
-import * as Fork from 'fork';
-import * as geom from 'geom';
+import * as Rect from 'rectangle';
 
 import type { Entity } from 'ecs';
-import type { Rectangle } from './rectangle';
-import type { ShellWindow } from './window';
 import type { Ext } from './extension';
+import type { Rectangle } from './rectangle';
 import { Stack } from './stack';
+import type { ShellWindow } from './window';
 
 const { Arena } = arena;
 const { Meta } = imports.gi;
@@ -350,7 +350,7 @@ export class Forest extends Ecs.World {
     }
 
     /** Detaches an entity from the a fork, re-arranging the fork's tree as necessary */
-    detach(ext: Ext, fork_entity: Entity, window: Entity): [Entity, Fork.Fork] | null {
+    detach(ext: Ext, fork_entity: Entity, window: Entity, destroy_stack: boolean = false): [Entity, Fork.Fork] | null {
         const fork = this.forks.get(fork_entity);
         if (!fork) return null;
 
@@ -387,8 +387,11 @@ export class Forest extends Ecs.World {
                 ext,
                 fork.left.inner as Node.NodeStack,
                 window,
-                () => {
-                    if (fork.right) {
+                destroy_stack,
+                (window: undefined | Entity) => {
+                    if (window)
+                        fork.left = Node.Node.window(window);
+                    else if (fork.right) {
                         fork.left = fork.right
                         fork.right = null
                         if (parent) {
@@ -428,9 +431,14 @@ export class Forest extends Ecs.World {
                     ext,
                     fork.right.inner as Node.NodeStack,
                     window,
-                    () => {
-                        fork.right = null
+                    destroy_stack,
+                    (window) => {
+                        if (window)
+                            fork.right = Node.Node.window(window);
+                        else {
+                        fork.right = null;
                         this.reassign_to_parent(fork, fork.left)
+                        }
                     },
                 );
             }
@@ -714,7 +722,7 @@ export class Forest extends Ecs.World {
     }
 
     /** Removes window from stack, destroying the stack if it was the last window. */
-    private remove_from_stack(ext: Ext, stack: Node.NodeStack, window: Entity, on_last: () => void) {
+    private remove_from_stack(ext: Ext, stack: Node.NodeStack, window: Entity, destroy_stack: boolean, on_last: (win?: Entity) => void) {
         if (stack.entities.length === 1) {
             this.stacks.remove(stack.idx)?.destroy();
             on_last();
@@ -723,6 +731,10 @@ export class Forest extends Ecs.World {
             if (s) {
                 Node.stack_remove(this, stack, window)
             }
+            if (destroy_stack && stack.entities.length === 1) {
+                on_last(stack.entities[0])
+                this.stacks.remove(stack.idx)?.destroy()
+            }
         }
 
         const win = ext.windows.get(window);