pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(layouts): do not default to default swap layouts when opening a new tab without swap layouts (#2336)

Browse source
This commit is contained in:
Aram Drevekenin 2023-03-30 16:53:46 +02:00 • committed by GitHub
parent 220f6684b0
commit d121c780bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
zellij-utils/src/input/actions.rs
View file

@ -440,16 +440,8 @@ impl Action {
if tabs.len() > 1 { if tabs.len() > 1 {
return Err(format!("Tab layout cannot itself have tabs")); return Err(format!("Tab layout cannot itself have tabs"));
} else if !tabs.is_empty() { } else if !tabs.is_empty() {
let swap_tiled_layouts = if layout.swap_tiled_layouts.is_empty() { let swap_tiled_layouts = Some(layout.swap_tiled_layouts.clone());
None let swap_floating_layouts = Some(layout.swap_floating_layouts.clone());
} else {
Some(layout.swap_tiled_layouts.clone())
};
let swap_floating_layouts = if layout.swap_floating_layouts.is_empty() {
None
} else {
Some(layout.swap_floating_layouts.clone())
};
let (tab_name, layout, floating_panes_layout) = let (tab_name, layout, floating_panes_layout) =
tabs.drain(..).next().unwrap(); tabs.drain(..).next().unwrap();
let name = tab_name.or(name); let name = tab_name.or(name);
@ -461,16 +453,8 @@ impl Action {
name, name,
)]) )])
} else { } else {
let swap_tiled_layouts = if layout.swap_tiled_layouts.is_empty() { let swap_tiled_layouts = Some(layout.swap_tiled_layouts.clone());
None let swap_floating_layouts = Some(layout.swap_floating_layouts.clone());
} else {
Some(layout.swap_tiled_layouts.clone())
};
let swap_floating_layouts = if layout.swap_floating_layouts.is_empty() {
None
} else {
Some(layout.swap_floating_layouts.clone())
};
let (layout, floating_panes_layout) = layout.new_tab(); let (layout, floating_panes_layout) = layout.new_tab();
Ok(vec![Action::NewTab( Ok(vec![Action::NewTab(
Some(layout), Some(layout),