monolith

public

Star0

Fork 0

Watch0

136 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `00c7b3db8a3f`

tarball

atagen <boss@atagen.co>2026-10-18 10:20 UTC

2 files changed+32-3

layout: swap with a stack that shows only one window

move_window entered any sibling container, so a stack whose other members sat on hidden tags swallowed the moving window although it looked like a lone window to swap with. It now enters only containers showing two or more windows.

Modified file: crates/layout/src/tests.rs+22 additions−2 deletions@@ -362,7 +362,7 @@ fn moving_past_hidden_windows_does_not_drift() {
     t.insert_after(h2, a);
     t.insert_after(b, h2);
     let vis = |w: u32| w != h && w != h2;
-    let once = t.arrange(AREA, 0.0, |_| true);
+    let mut once = None;
     for _ in 0..4 {
         for d in [Dir::Up, Dir::Up, Dir::Down] {
             t.move_window(b, d, vis);
@@ -374,8 +374,9 @@ fn moving_past_hidden_windows_does_not_drift() {
             );
         }
         t.check();
+        let all = t.arrange(AREA, 0.0, |_| true);
+        assert_eq!(*once.get_or_insert_with(|| all.clone()), all);
     }
-    assert_eq!(t.arrange(AREA, 0.0, |_| true), once);
 }
 
 /// Monitors sleeping together unplug one after another, so windows already
@@ -397,3 +398,22 @@ fn windows_return_to_where_they_were_first_evicted_from() {
     assert_eq!(l.window(w).unwrap().output, Some(a));
     assert!(l.output(a).unwrap().tree.contains(w));
 }
+
+/// A stack showing one window looks like a lone window, so moving toward it
+/// swaps places instead of joining a stack the user cannot see.
+#[test]
+fn moving_toward_a_stack_showing_one_window_swaps() {
+    let (a, b, h) = (1, 2, 3);
+    let mut t: Tree<u32> = Tree::default();
+    t.insert_row(a);
+    t.insert_after(b, a);
+    t.insert_after(h, b);
+    assert!(t.merge_window(h, Dir::Left, |_| true));
+    let vis = |w: u32| w != h;
+    assert!(t.move_window(a, Dir::Right, vis));
+    t.check();
+    let shown = t.arrange(AREA, 0.0, vis);
+    let rect = |w| shown.iter().find(|p| p.0 == w).unwrap().1;
+    assert!(rect(b).x < rect(a).x);
+    assert_eq!(rect(a).h, AREA.h);
+}

Modified file: crates/layout/src/tree.rs+10 additions−1 deletions@@ -487,7 +487,7 @@ impl<W: Copy + Eq + Hash> Tree<W> {
                 }
                 if let Some(j) = self.next_shown(p, i, dir, vis) {
                     let sib = self.children(p)[j];
-                    if enter && self.axis(sib).is_some() {
+                    if enter && self.shown_windows(sib, vis) > 1 {
                         self.join_lane(n, p, j);
                     } else {
                         let children = self.children_mut(p);
@@ -724,6 +724,15 @@ impl<W: Copy + Eq + Hash> Tree<W> {
         }
     }
 
+    fn shown_windows(&self, n: NodeId, vis: &impl Fn(W) -> bool) -> usize {
+        match &self.nodes[n].kind {
+            Kind::Leaf(w, _) => usize::from(vis(*w)),
+            Kind::Container { children, .. } => {
+                children.iter().map(|&c| self.shown_windows(c, vis)).sum()
+            }
+        }
+    }
+
     #[cfg(test)]
     pub(crate) fn check(&self) {
         let reachable = match self.root {

monolith

Commit 00c7b3db8a3f

Commit `00c7b3db8a3f`