zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-12-22 16:51:43 +03:00
Code Issues Projects Releases Wiki Activity

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