Mirrors/ratatui
2
0
Fork 0
mirror of https://github.com/ratatui-org/ratatui synced 2025-02-01 06:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make margins be vertical or horizontal

Browse source 
This adds support for margins to be either vertical or horizontal, or
both.
This commit is contained in:
Jeffas 2019-07-24 10:49:07 +01:00 committed by Florian Dehau
parent 9c8d62151b
commit db9b1dd689
1 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/layout.rs
View file

@ -30,6 +30,12 @@ pub enum Constraint {
Min(u16), Min(u16),
} }
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Margin {
vertical: u16,
horizontal: u16,
}
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq)]
pub enum Alignment { pub enum Alignment {
Left, Left,
@ -41,7 +47,7 @@ pub enum Alignment {
#[derive(Debug, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Layout { pub struct Layout {
direction: Direction, direction: Direction,
margin: u16, margin: Margin,
constraints: Vec<Constraint>, constraints: Vec<Constraint>,
} }
@ -53,7 +59,10 @@ impl Default for Layout {
fn default() -> Layout { fn default() -> Layout {
Layout { Layout {
direction: Direction::Vertical, direction: Direction::Vertical,
margin: 0, margin: Margin {
horizontal: 0,
vertical: 0,
},
constraints: Vec::new(), constraints: Vec::new(),
} }
} }
@ -69,7 +78,20 @@ impl Layout {
} }
pub fn margin(mut self, margin: u16) -> Layout { pub fn margin(mut self, margin: u16) -> Layout {
self.margin = margin; self.margin = Margin {
horizontal: margin,
vertical: margin,
};
self
}
pub fn horizontal_margin(mut self, horizontal: u16) -> Layout {
self.margin.horizontal = horizontal;
self
}
pub fn vertical_margin(mut self, vertical: u16) -> Layout {
self.margin.vertical = vertical;
self self
} }
@ -167,7 +189,7 @@ fn split(area: Rect, layout: &Layout) -> Vec<Rect> {
.map(|_| Rect::default()) .map(|_| Rect::default())
.collect::<Vec<Rect>>(); .collect::<Vec<Rect>>();
let dest_area = area.inner(layout.margin); let dest_area = area.inner(&layout.margin);
for (i, e) in elements.iter().enumerate() { for (i, e) in elements.iter().enumerate() {
vars.insert(e.x, (i, 0)); vars.insert(e.x, (i, 0));
vars.insert(e.y, (i, 1)); vars.insert(e.y, (i, 1));
@ -378,15 +400,15 @@ impl Rect {
self.y + self.height self.y + self.height
} }
pub fn inner(self, margin: u16) -> Rect { pub fn inner(self, margin: &Margin) -> Rect {
if self.width < 2 * margin || self.height < 2 * margin { if self.width < 2 * margin.horizontal || self.height < 2 * margin.vertical {
Rect::default() Rect::default()
} else { } else {
Rect { Rect {
x: self.x + margin, x: self.x + margin.horizontal,
y: self.y + margin, y: self.y + margin.vertical,
width: self.width - 2 * margin, width: self.width - 2 * margin.horizontal,
height: self.height - 2 * margin, height: self.height - 2 * margin.vertical,
} }
} }
} }