normalizeContainersRecursive fix bug: flatten leaf windows

nikitabobko · Oct 15, 2023 · 81d5069 · 81d5069
1 parent acc507e
commit 81d5069
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/tree/TilingContainer.swift b/src/tree/TilingContainer.swift
@@ -20,12 +20,12 @@ class TilingContainer: TreeNode, NonLeafTreeNode {
 
 extension TilingContainer {
     func normalizeContainersRecursive() {
-        if let child = children.singleOrNil() as? TilingContainer, config.autoFlattenContainers {
+        if let child = children.singleOrNil(), !isRootContainer, config.autoFlattenContainers {
             child.unbindFromParent()
             let parent = parent
             let previousBinding = unbindFromParent()
             child.bindTo(parent: parent, adaptiveWeight: previousBinding.adaptiveWeight, index: previousBinding.index)
-            child.normalizeContainersRecursive()
+            (child as? TilingContainer)?.normalizeContainersRecursive()
         } else {
             for child in children {
                 (child as? TilingContainer)?.normalizeContainersRecursive()

diff --git a/test/tree/TreeNodeTest.swift b/test/tree/TreeNodeTest.swift
@@ -36,6 +36,26 @@ final class TreeNodeTest: XCTestCase {
         XCTAssertNotEqual(root, nil)
     }
 
+    func testNormalizeContainers_dontRemoveRoot_autoFlattenContainers() {
+        config.autoFlattenContainers = true
+        weak var root = Workspace.get(byName: name).rootTilingContainer
+        XCTAssertNotEqual(root, nil)
+        XCTAssertTrue(root!.isEffectivelyEmpty)
+        root?.normalizeContainersRecursive()
+        XCTAssertNotEqual(root, nil)
+    }
+
+    func testNormalizeContainers_singleWindowChild() {
+        config.autoFlattenContainers = true
+        let root = Workspace.get(byName: name).rootTilingContainer.apply {
+            TilingContainer.newHList(parent: $0, adaptiveWeight: 1).apply {
+                TestWindow(id: 1, parent: $0)
+            }
+        }
+        root.normalizeContainersRecursive()
+        XCTAssertTrue((root.children.singleOrNil() as? Window)?.windowId == 1)
+    }
+
     func testNormalizeContainers_removeEffectivelyEmpty() {
         let root = Workspace.get(byName: name).rootTilingContainer.apply {
             TilingContainer.newVList(parent: $0, adaptiveWeight: 1).apply {