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

test(layout): add borderless

Browse source
This commit is contained in:
Aram Drevekenin 2021-08-24 15:02:21 +02:00
parent 618c2c376b
commit 06e3be6205
2 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
zellij-utils/src/input/layout.rs
View file

@ -68,6 +68,8 @@ pub struct LayoutFromYaml {
//#[serde(default)] //#[serde(default)]
pub template: LayoutTemplateFromYaml, pub template: LayoutTemplateFromYaml,
#[serde(default)] #[serde(default)]
pub borderless: bool,
#[serde(default)]
pub tabs: Vec<TabLayout>, pub tabs: Vec<TabLayout>,
} }
@ -163,6 +165,8 @@ impl LayoutFromYaml {
pub struct LayoutTemplateFromYaml { pub struct LayoutTemplateFromYaml {
pub direction: Direction, pub direction: Direction,
#[serde(default)] #[serde(default)]
pub borderless: bool,
#[serde(default)]
pub parts: Vec<LayoutTemplateFromYaml>, pub parts: Vec<LayoutTemplateFromYaml>,
#[serde(default)] #[serde(default)]
pub body: bool, pub body: bool,
@ -219,6 +223,8 @@ impl LayoutTemplateFromYaml {
pub struct TabLayout { pub struct TabLayout {
pub direction: Direction, pub direction: Direction,
#[serde(default)] #[serde(default)]
pub borderless: bool,
#[serde(default)]
pub parts: Vec<TabLayout>, pub parts: Vec<TabLayout>,
pub split_size: Option<SplitSize>, pub split_size: Option<SplitSize>,
pub run: Option<Run>, pub run: Option<Run>,
@ -548,6 +554,7 @@ impl From<TabLayout> for Layout {
fn from(tab: TabLayout) -> Self { fn from(tab: TabLayout) -> Self {
Layout { Layout {
direction: tab.direction, direction: tab.direction,
borderless: tab.borderless,
parts: Layout::from_vec_tab_layout(tab.parts), parts: Layout::from_vec_tab_layout(tab.parts),
tabs: vec![], tabs: vec![],
split_size: tab.split_size, split_size: tab.split_size,
@ -560,6 +567,7 @@ impl From<LayoutTemplateFromYaml> for Layout {
fn from(template: LayoutTemplateFromYaml) -> Self { fn from(template: LayoutTemplateFromYaml) -> Self {
Layout { Layout {
direction: template.direction, direction: template.direction,
borderless: template.borderless,
parts: Layout::from_vec_template_layout(template.parts), parts: Layout::from_vec_template_layout(template.parts),
tabs: vec![], tabs: vec![],
split_size: template.split_size, split_size: template.split_size,
@ -572,6 +580,7 @@ impl Default for TabLayout {
fn default() -> Self { fn default() -> Self {
Self { Self {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
split_size: None, split_size: None,
run: None, run: None,

52
zellij-utils/src/input/unit/layout_test.rs
View file

@ -54,9 +54,11 @@ fn default_layout_merged_correctly() {
let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone())); let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone()));
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(1)), split_size: Some(SplitSize::Fixed(1)),
@ -64,6 +66,7 @@ fn default_layout_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -71,6 +74,7 @@ fn default_layout_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(2)), split_size: Some(SplitSize::Fixed(2)),
@ -95,9 +99,11 @@ fn default_layout_new_tab_correct() {
let tab_layout = layout_template.construct_tab_layout(None); let tab_layout = layout_template.construct_tab_layout(None);
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(1)), split_size: Some(SplitSize::Fixed(1)),
@ -105,6 +111,7 @@ fn default_layout_new_tab_correct() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -112,6 +119,7 @@ fn default_layout_new_tab_correct() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(2)), split_size: Some(SplitSize::Fixed(2)),
@ -208,11 +216,14 @@ fn three_panes_with_tab_merged_correctly() {
let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone())); let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone()));
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![Layout { parts: vec![Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -220,9 +231,11 @@ fn three_panes_with_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -230,6 +243,7 @@ fn three_panes_with_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -260,8 +274,10 @@ fn three_panes_with_tab_new_tab_is_correct() {
let tab_layout = layout_template.construct_tab_layout(None); let tab_layout = layout_template.construct_tab_layout(None);
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![Layout { parts: vec![Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -313,9 +329,11 @@ fn three_panes_with_tab_and_default_plugins_merged_correctly() {
let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone())); let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone()));
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(1)), split_size: Some(SplitSize::Fixed(1)),
@ -323,9 +341,11 @@ fn three_panes_with_tab_and_default_plugins_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -333,9 +353,11 @@ fn three_panes_with_tab_and_default_plugins_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -343,6 +365,7 @@ fn three_panes_with_tab_and_default_plugins_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -360,6 +383,7 @@ fn three_panes_with_tab_and_default_plugins_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(2)), split_size: Some(SplitSize::Fixed(2)),
@ -381,9 +405,11 @@ fn three_panes_with_tab_and_default_plugins_new_tab_is_correct() {
let tab_layout = layout_template.construct_tab_layout(None); let tab_layout = layout_template.construct_tab_layout(None);
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(1)), split_size: Some(SplitSize::Fixed(1)),
@ -391,6 +417,7 @@ fn three_panes_with_tab_and_default_plugins_new_tab_is_correct() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -398,6 +425,7 @@ fn three_panes_with_tab_and_default_plugins_new_tab_is_correct() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Fixed(2)), split_size: Some(SplitSize::Fixed(2)),
@ -450,12 +478,15 @@ fn deeply_nested_tab_merged_correctly() {
let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone())); let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone()));
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(21)), split_size: Some(SplitSize::Percent(21)),
@ -463,9 +494,11 @@ fn deeply_nested_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(22)), split_size: Some(SplitSize::Percent(22)),
@ -473,8 +506,10 @@ fn deeply_nested_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![Layout { parts: vec![Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(23)), split_size: Some(SplitSize::Percent(23)),
@ -496,6 +531,7 @@ fn deeply_nested_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(24)), split_size: Some(SplitSize::Percent(24)),
@ -503,6 +539,7 @@ fn deeply_nested_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(15)), split_size: Some(SplitSize::Percent(15)),
@ -510,6 +547,7 @@ fn deeply_nested_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(15)), split_size: Some(SplitSize::Percent(15)),
@ -517,6 +555,7 @@ fn deeply_nested_tab_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(15)), split_size: Some(SplitSize::Percent(15)),
@ -564,9 +603,11 @@ fn three_tabs_tab_one_merged_correctly() {
let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone())); let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[0].clone()));
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -574,6 +615,7 @@ fn three_tabs_tab_one_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -599,12 +641,15 @@ fn three_tabs_tab_two_merged_correctly() {
let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[1].clone())); let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[1].clone()));
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -612,6 +657,7 @@ fn three_tabs_tab_two_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -624,6 +670,7 @@ fn three_tabs_tab_two_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -646,12 +693,15 @@ fn three_tabs_tab_three_merged_correctly() {
let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[2].clone())); let tab_layout = layout_template.construct_tab_layout(Some(layout_template.tabs[2].clone()));
let merged_layout = Layout { let merged_layout = Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![ parts: vec![
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: Some(SplitSize::Percent(50)), split_size: Some(SplitSize::Percent(50)),
@ -659,6 +709,7 @@ fn three_tabs_tab_three_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,
@ -671,6 +722,7 @@ fn three_tabs_tab_three_merged_correctly() {
}, },
Layout { Layout {
direction: Direction::Horizontal, direction: Direction::Horizontal,
borderless: false,
parts: vec![], parts: vec![],
tabs: vec![], tabs: vec![],
split_size: None, split_size: None,