dwindle insertion success

Author: HolbyFPV

packages/wm/src/commands/container/detach_container.rs

@@ -11,14 +11,14 @@ use crate::{
 /// If the container is a tiling container, the siblings will be resized to
 /// fill the freed up space. Will flatten empty parent split containers.
 #[allow(clippy::needless_pass_by_value)]
-pub fn detach_container(child_to_remove: Container) -> anyhow::Result<Container> {
+pub fn detach_container(child_to_remove: Container, preserve_containers: bool) -> anyhow::Result<Container> {
   // Flatten the parent split container if it'll be empty after removing
   // the child.
   if let Some(split_parent) = child_to_remove
     .parent()
     .and_then(|parent| parent.as_split().cloned())
   {
-    if split_parent.child_count() == 1 {
+    if split_parent.child_count() == 1 && !preserve_containers {
       flatten_split_container(split_parent)?;
     }
   }

packages/wm/src/commands/container/move_container_within_tree.rs

@@ -94,7 +94,7 @@ pub fn move_container_within_tree(
   let is_subtree_focused =
     original_focus_index < target_parent_ancestor.focus_index();
 
-  detach_container(container_to_move.clone())?;
+  detach_container(container_to_move.clone(), false)?;
   attach_container(
     &container_to_move.clone(),
     &target_parent.clone(),
@@ -152,7 +152,7 @@ fn move_to_lowest_common_ancestor(
     .map(|ancestor| ancestor.focus_index())
     .context("Failed to get focus index of container's ancestor.")?;
 
-  detach_container(container_to_move.clone())?;
+  detach_container(container_to_move.clone(), false)?;
 
   attach_container(
     &container_to_move.clone(),

packages/wm/src/commands/container/replace_container.rs

@@ -10,7 +10,7 @@ use crate::{
 /// Replaces a container at the specified index.
 ///
 /// The replaced container will be detached from the tree.
-/// 
+///
 /// TODO return container and call 2 replace_continaers in swap_container
 pub fn replace_container(
   replacement_container: &Container,
@@ -38,7 +38,7 @@ pub fn replace_container(
   // container to flatten. Currently, that scenario shouldn't be possible.
   // We also can't attach first before detaching, because detaching
   // removes child based on ID and both containers might have the same ID.
-  detach_container(container_to_replace)?;
+  detach_container(container_to_replace, false)?;
 
   attach_container(
     replacement_container,

packages/wm/src/commands/layouts/add_dwindle_window.rs

@@ -23,195 +23,73 @@ pub fn add_dwindle_window(
   config: &UserConfig,
   state: &mut WmState,
 ) -> anyhow::Result<WindowContainer> {
-  // Create a TilingWindow from NativeWindow.
-  let border_delta = RectDelta::new(
-    LengthValue::from_px(0),
-    LengthValue::from_px(0),
-    LengthValue::from_px(0),
-    LengthValue::from_px(0),
-  );
-  let gaps_config = config.value.gaps.clone();
   let new_window = TilingWindow::new(
     None,
     native_window,
     None,
-    border_delta,
+    RectDelta::new(
+      LengthValue::from_px(0),
+      LengthValue::from_px(0),
+      LengthValue::from_px(0),
+      LengthValue::from_px(0),
+    ),
     Rect {
       left: 0,
       top: 0,
       right: 0,
       bottom: 0,
     },
     false,
-    gaps_config,
+    config.value.gaps.clone(),
     Vec::new(),
     None,
   );
 
-  // Setup the initial dwindle layout.
-  if target_workspace.child_count() == 0 {
-    attach_container(
-      &new_window.clone().into(),
-      &target_workspace.clone().into(),
-      None,
-    )?;
-    return new_window.as_window_container();
-  } else if target_workspace.child_count() == 1 {
-    let new_split_container = SplitContainer::new(
-      TilingDirection::Vertical,
-      config.value.gaps.clone(),
-    );
-    attach_container(
-      &new_window.clone().into(),
-      &new_split_container.clone().into(),
-      None,
-    )?;
-    attach_container(
-      &new_split_container.clone().into(),
-      &target_workspace.clone().into(),
-      None,
-    )?;
-    return new_window.as_window_container();
-  }
-
-  // At this point, we have at least 2 windows.
-  // This logic inserts the new window after the focused window, shifting
-  // all deeper windows in the dwindle tree downwards to make room.
-  let target_parent = target_container.parent().context("No parent.")?;
-  let child_count = target_parent.child_count();
-  let focused_index = target_container.index();
+  // Get starting point - use target's parent if it exists
+  let start_container = if target_workspace.child_count() <= 1 {
+    target_workspace.clone().into()
+  } else {
+    target_container.parent().context("No parent.")?
+  };
 
-  // Re-organize the containers
-  let mut workspace_children = target_parent.borrow_children_mut();
-
-  // The 2nd container is always a SplitContainer, 1st is just a window.
-  let mut split_container =
-    workspace_children.back().context("No children.")?;
-  let mut split_children = split_container.borrow_children_mut();
-  let window_to_shift =
-    detach_container(*split_children.front().unwrap()).ok();
-  attach_container(
-    &new_window.clone().into(),
-    &split_container.clone().into(),
-    None,
-  )?;
-  // let mut window_to_shift = split_children.pop_front();
-  // split_children.insert(0, target_container.clone());
-  //
-  while let Some(window) = window_to_shift {
-    // Get the back container using a temporary reference
-    let back = {
-      let current_children = &split_children;
-      current_children.back().context("No children.")?
-    };
+  let mut current = start_container;
+  let mut window = new_window.clone().into();
 
-    // Clone the container since we need to use it after the borrow ends
-    let next_container = back.clone();
+  loop {
+    if current.child_count() <= 1 {
+      if current.child_count() == 0 {
+        attach_container(&window, &current, Some(0))?;
+        break;
+      }
 
-    // Get the children of the next container
-    let mut next_children = next_container.children();
+      let direction = if current.as_workspace().is_some() {
+        TilingDirection::Vertical
+      } else {
+        current
+          .as_direction_container()?
+          .tiling_direction()
+          .inverse()
+      };
 
-    if next_children.iter().count() == 1 {
-      // Create the new split container
-      let new_split_direction = next_container
-        .as_direction_container()?
-        .tiling_direction()
-        .inverse();
-
-      let new_split_container = SplitContainer::new(
-        new_split_direction,
-        config.value.gaps.clone(),
-      );
-
-      // Add the window to the new container and attach
-      new_split_container.borrow_children_mut().push_back(window);
-      attach_container(
-        &new_split_container.clone().into(),
-        &next_container.clone().into(),
-        None,
-      )?;
+      let new_split =
+        SplitContainer::new(direction, config.value.gaps.clone());
+      attach_container(&window, &new_split.clone().into(), Some(0))?;
+      attach_container(&new_split.clone().into(), &current, Some(1))?;
       break;
     }
 
-    // Shift windows
-    let next_window = next_children.pop_front();
-    next_children.insert(0, window);
+    // Get existing split and its window
+    let next_split = current.borrow_children().get(1).unwrap().clone();
+    let next_window = next_split.borrow_children().get(0).unwrap().clone();
 
-    // Prepare for next iteration
-    split_container = &next_container;
-    split_children = split_container.children();
-    window_to_shift = next_window;
+    // Swap windows
+    let detached = detach_container(next_window, true)?;
+    attach_container(&window, &next_split.clone().into(), Some(0))?;
+
+    // Move to next container
+    current = next_split;
+    window = detached;
   }
+
   new_window.as_window_container()
 }
-// ) -> anyhow::Result<(Container, usize)> {
-//   let child_count = target_workspace.child_count();
-//
-//   if child_count == 0 {
-//     Ok((target_workspace.clone().into(), 0))
-//   } else if child_count == 1 {
-//     // Create a vertical split container for the stack
-//     let new_container = SplitContainer::new(
-//       TilingDirection::Vertical,
-//       config.value.gaps.clone(),
-//     );
-//     {
-//       let master_containers = target_workspace.borrow_children_mut();
-//       let only_container = master_containers.front().unwrap();
-//       state
-//         .pending_sync
-//         .queue_container_to_redraw(only_container.clone());
-//     }
-//     attach_container(
-//       &new_container.clone().into(),
-//       &target_workspace.clone().into(),
-//       None,
-//     )?;
-//     Ok((new_container.clone().into(), 0))
-//   } else if child_count == 2 {
-//     let children = target_workspace.borrow_children_mut();
-//     let back_container = children.back().context("No children.")?;
-//     let back_clone = back_container.clone();
-//     drop(children);
-//
-//     // Now work with the cloned container
-//     let mut current_container = back_clone;
-//
-//     while current_container.children().iter().count() > 1 {
-//       // Create a new borrow scope
-//       let next_container = {
-//         let children = current_container.borrow_children_mut();
-//         let back = children.back().context("No children.")?;
-//         back.clone() // Clone it so we can drop the borrow
-//       };
-//       current_container = next_container;
-//     }
-//
-//     let current_child_count =
-// current_container.children().iter().count();     if current_child_count
-// == 0 {       Ok((target_workspace.clone().into(), 0))
-//     } else if current_child_count == 1 {
-//       let new_split_direction = current_container
-//         .as_direction_container()?
-//         .tiling_direction()
-//         .inverse();
-//       let split_container = SplitContainer::new(
-//         new_split_direction,
-//         config.value.gaps.clone(),
-//       );
-//       state
-//         .pending_sync
-//         .queue_container_to_redraw(current_container.clone());
-//       attach_container(
-//         &split_container.clone().into(),
-//         &current_container.clone().into(),
-//         None,
-//       )?;
-//       Ok((split_container.clone().into(), 0))
-//     } else {
-//       Err(anyhow::anyhow!("Unexpected child count"))
-//     }
-//   } else {
-//     Err(anyhow::anyhow!("Unexpected child count"))
-//   }
-// }

packages/wm/src/commands/monitor/remove_monitor.rs

@@ -49,7 +49,7 @@ pub fn remove_monitor(
     });
   }
 
-  detach_container(monitor.clone().into())?;
+  detach_container(monitor.clone().into(), false)?;
 
   state.emit_event(WmEvent::MonitorRemoved {
     removed_id: monitor.id(),

packages/wm/src/commands/window/ignore_window.rs

@@ -19,7 +19,7 @@ pub fn ignore_window(
   let ancestors = window.ancestors().take(3).collect::<Vec<_>>();
 
   state.ignored_windows.push(window.native().clone());
-  detach_container(window.clone().into())?;
+  detach_container(window.clone().into(), false)?;
 
   // After detaching the container, flatten any redundant split containers.
   // For example, in the layout V[1 H[2]] where container 1 is detached to

packages/wm/src/commands/window/unmanage_window.rs

@@ -22,7 +22,7 @@ pub fn unmanage_window(
   // Get container to switch focus to after the window has been removed.
   let focus_target = state.focus_target_after_removal(&window.clone());
 
-  detach_container(window.clone().into())?;
+  detach_container(window.clone().into(), false)?;
 
   // After detaching the container, flatten any redundant split containers.
   // For example, in the layout V[1 H[2]] where container 1 is detached to

packages/wm/src/commands/workspace/deactivate_workspace.rs

@@ -15,7 +15,7 @@ pub fn deactivate_workspace(
 ) -> anyhow::Result<()> {
   info!("Deactivating workspace: {workspace}");
 
-  detach_container(workspace.clone().into())?;
+  detach_container(workspace.clone().into(), false)?;
 
   state.emit_event(WmEvent::WorkspaceDeactivated {
     deactivated_id: workspace.id(),