Cleanup

Author: nikitabobko

src/axWrappers/MacWindow.swift

@@ -53,7 +53,7 @@ class MacWindow: TreeNode, Hashable {
                         ?? workspace.rootTilingContainer
                 parent = tilingParent
                 weight = parent.children.sumOf { $0.getWeight(tilingParent.orientation) }
-                        .div(parent.children.count, orIfZero: 1)
+                        .div(parent.children.count) ?? 1
             }
             let window = MacWindow(id, app, axWindow, parent: parent, adaptiveWeight: weight)
 

src/model/TilingContainer.swift

@@ -30,21 +30,24 @@ extension TilingContainer {
     }
 
     func normalizeContainersRecursive() {
-        if children.isEmpty && !(parent is Workspace) {
+        if children.isEmpty && !isRootContainer {
             unbindFromParent()
         }
         // todo make it configurable
         if let child = children.singleOrNil() as? TilingContainer { // flatten containers
             let previousBinding = unbindFromParent()
             child.bindTo(parent: parent, adaptiveWeight: previousBinding.adaptiveWeight, index: previousBinding.index)
             child.normalizeContainersRecursive()
-        }
-        for child in children {
-            if let tilingChild = child as? TilingContainer {
-                tilingChild.normalizeContainersRecursive()
+        } else {
+            for child in children {
+                if let tilingChild = child as? TilingContainer {
+                    tilingChild.normalizeContainersRecursive()
+                }
             }
         }
     }
+
+    var isRootContainer: Bool { parent is Workspace }
 }
 
 enum Orientation {

src/model/TreeNode.swift

@@ -35,7 +35,7 @@ class TreeNode: Equatable {
             return tilingParent.orientation == targetOrientation ? adaptiveWeight : parent.getWeight(targetOrientation)
         } else {
             precondition(parent is Workspace)
-            if self is MacWindow { // self is floating window
+            if self is MacWindow { // self is a floating window
                 error("Weight doesn't make sense for floating windows")
             } else { // root tiling container
                 precondition(self is TilingContainer)

src/util/utils.swift

@@ -81,10 +81,6 @@ extension CGPoint {
 }
 
 extension CGFloat {
-    func div(_ denominator: Int, orIfZero: CGFloat) -> CGFloat {
-        denominator == 0 ? orIfZero : self / CGFloat(denominator)
-    }
-
     func div(_ denominator: Int) -> CGFloat? {
         denominator == 0 ? nil : self / CGFloat(denominator)
     }