zellij-org/zellij
1
0
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2026-10-11 22:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(layout): compose the containing node's cwd into floating panes (#5503)

Browse Source
This commit is contained in:
Pilgrim Lyieu
2026-08-25 09:51:59 +02:00
committed by GitHub
parent b0bd3e1e7f
commit 75f9a38715
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zellij-utils/src/kdl/kdl_layout_parser.rs
+6 -4
View File
@@ -2099,6 +2099,11 @@ impl<'a> KdlLayoutParser<'a> {
let mut floating_panes = vec![];
self.assert_valid_tab_properties(layout_node)?;
self.populate_floating_pane_children(layout_node, &mut floating_panes)?;
if let Some(cwd_prefix) = self.cwd_prefix(None)? {
for floating_pane in floating_panes.iter_mut() {
floating_pane.add_cwd_to_layout(&cwd_prefix);
}
}
Ok(floating_panes)
}
fn populate_one_swap_floating_layout_with_template(
@@ -2364,10 +2369,7 @@ impl<'a> KdlLayoutParser<'a> {
if let Some(children) = kdl_children_nodes!(child) {
for child in children {
if kdl_name!(child) == "pane" {
let mut pane_node = self.parse_floating_pane_node(child)?;
if let Some(global_cwd) = &self.global_cwd {
pane_node.add_cwd_to_layout(&global_cwd);
}
let pane_node = self.parse_floating_pane_node(child)?;
child_floating_panes.push(pane_node);
} else if let Some((pane_template, pane_template_kdl_node)) =
self.pane_templates.get(kdl_name!(child)).cloned()