Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(layouts): don't default to default swap layouts on new-tab action #2336

Merged
merged 1 commit into from
Mar 30, 2023
Merged

fix(layouts): don't default to default swap layouts on new-tab action #2336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions zellij-utils/src/input/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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),
Expand Down