mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-03 02:47:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

tui: Constify functions, shrink Margin representation

Browse source
This commit is contained in:
Blaž Hrastnik 2024-05-21 04:34:36 +09:00
parent e94735bbd3
commit dfcd814389
14 changed files with 102 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

16
helix-tui/src/layout.rs
View file

@ -83,24 +83,22 @@ impl Layout {
self
}
pub fn margin(mut self, margin: u16) -> Layout {
pub const fn margin(mut self, margin: u16) -> Layout {
self.margin = Margin::all(margin);
self
}
pub fn horizontal_margin(mut self, horizontal: u16) -> Layout {
self.margin.left = horizontal;
self.margin.right = horizontal;
pub const fn horizontal_margin(mut self, horizontal: u16) -> Layout {
self.margin.horizontal = horizontal;
self
}
pub fn vertical_margin(mut self, vertical: u16) -> Layout {
self.margin.top = vertical;
self.margin.bottom = vertical;
pub const fn vertical_margin(mut self, vertical: u16) -> Layout {
self.margin.vertical = vertical;
self
}
pub fn direction(mut self, direction: Direction) -> Layout {
pub const fn direction(mut self, direction: Direction) -> Layout {
self.direction = direction;
self
}
@ -191,7 +189,7 @@ fn split(area: Rect, layout: &Layout) -> Vec<Rect> {
.map(|_| Rect::default())
.collect::<Vec<Rect>>();
let dest_area = area.inner(&layout.margin);
let dest_area = area.inner(layout.margin);
for (i, e) in elements.iter().enumerate() {
vars.insert(e.x, (i, 0));
vars.insert(e.y, (i, 1));

48
helix-tui/src/widgets/block.rs
View file

@ -1,7 +1,7 @@
use crate::{
buffer::Buffer,
symbols::line,
text::{Span, Spans},
text::Spans,
widgets::{Borders, Widget},
};
use helix_view::graphics::{Rect, Style};
@ -58,6 +58,22 @@ pub struct Block<'a> {
}
impl<'a> Block<'a> {
pub const fn new() -> Self {
Self {
title: None,
borders: Borders::empty(),
border_style: Style::new(),
border_type: BorderType::Plain,
style: Style::new(),
}
}
pub const fn bordered() -> Self {
let mut block = Self::new();
block.borders = Borders::ALL;
block
}
pub fn title<T>(mut self, title: T) -> Block<'a>
where
T: Into<Spans<'a>>,
@ -66,34 +82,22 @@ impl<'a> Block<'a> {
self
}
#[deprecated(
since = "0.10.0",
note = "You should use styling capabilities of `text::Spans` given as argument of the `title` method to apply styling to the title."
)]
pub fn title_style(mut self, style: Style) -> Block<'a> {
if let Some(t) = self.title {
let title = String::from(&t);
self.title = Some(Spans::from(Span::styled(title, style)));
}
self
}
pub fn border_style(mut self, style: Style) -> Block<'a> {
pub const fn border_style(mut self, style: Style) -> Block<'a> {
self.border_style = style;
self
}
pub fn style(mut self, style: Style) -> Block<'a> {
pub const fn style(mut self, style: Style) -> Block<'a> {
self.style = style;
self
}
pub fn borders(mut self, flag: Borders) -> Block<'a> {
pub const fn borders(mut self, flag: Borders) -> Block<'a> {
self.borders = flag;
self
}
pub fn border_type(mut self, border_type: BorderType) -> Block<'a> {
pub const fn border_type(mut self, border_type: BorderType) -> Block<'a> {
self.border_type = border_type;
self
}
@ -413,9 +417,7 @@ mod tests {
// All borders
assert_eq!(
Block::default()
.borders(Borders::ALL)
.inner(Rect::default()),
Block::bordered().inner(Rect::default()),
Rect {
x: 0,
y: 0,
@ -425,7 +427,7 @@ mod tests {
"all borders, width=0, height=0"
);
assert_eq!(
Block::default().borders(Borders::ALL).inner(Rect {
Block::bordered().inner(Rect {
x: 0,
y: 0,
width: 1,
@ -440,7 +442,7 @@ mod tests {
"all borders, width=1, height=1"
);
assert_eq!(
Block::default().borders(Borders::ALL).inner(Rect {
Block::bordered().inner(Rect {
x: 0,
y: 0,
width: 2,
@ -455,7 +457,7 @@ mod tests {
"all borders, width=2, height=2"
);
assert_eq!(
Block::default().borders(Borders::ALL).inner(Rect {
Block::bordered().inner(Rect {
x: 0,
y: 0,
width: 3,

2
helix-tui/src/widgets/list.rs
View file

@ -72,7 +72,7 @@ impl<'a> ListItem<'a> {
/// # use helix_tui::style::{Style, Color, Modifier};
/// let items = [ListItem::new("Item 1"), ListItem::new("Item 2"), ListItem::new("Item 3")];
/// List::new(items)
/// .block(Block::default().title("List").borders(Borders::ALL))
/// .block(Block::bordered().title("List"))
/// .style(Style::default().fg(Color::White))
/// .highlight_style(Style::default().add_modifier(Modifier::ITALIC))
/// .highlight_symbol(">>");

2
helix-tui/src/widgets/paragraph.rs
View file

@ -37,7 +37,7 @@ fn get_line_offset(line_width: u16, text_area_width: u16, alignment: Alignment)
/// Spans::from(Span::styled("Second line", Style::default().fg(Color::Red))),
/// ]);
/// Paragraph::new(&text)
/// .block(Block::default().title("Paragraph").borders(Borders::ALL))
/// .block(Block::bordered().title("Paragraph"))
/// .style(Style::default().fg(Color::White).bg(Color::Black))
/// .alignment(Alignment::Center)
/// .wrap(Wrap { trim: true });

10
helix-tui/tests/widgets_paragraph.rs
View file

@ -23,7 +23,7 @@
// let size = f.size();
// let text = Text::from(SAMPLE_STRING);
// let paragraph = Paragraph::new(&text)
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .alignment(alignment)
// .wrap(Wrap { trim: true });
// f.render_widget(paragraph, size);
@ -90,7 +90,7 @@
// let size = f.size();
// let text = Text::from(s);
// let paragraph = Paragraph::new(&text)
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .wrap(Wrap { trim: true });
// f.render_widget(paragraph, size);
// })
@ -122,7 +122,7 @@
// let size = f.size();
// let text = Text::from(s);
// let paragraph = Paragraph::new(&text)
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .wrap(Wrap { trim: true });
// f.render_widget(paragraph, size);
// })
@ -156,7 +156,7 @@
// .draw(|f| {
// let size = f.size();
// let text = Text::from(line);
// let paragraph = Paragraph::new(&text).block(Block::default().borders(Borders::ALL));
// let paragraph = Paragraph::new(&text).block(Block::bordered());
// f.render_widget(paragraph, size);
// })
// .unwrap();
@ -175,7 +175,7 @@
// "段落现在可以水平滚动了！\nParagraph can scroll horizontally!\nShort line",
// );
// let paragraph = Paragraph::new(&text)
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .alignment(alignment)
// .scroll(scroll);
// f.render_widget(paragraph, size);

12
helix-tui/tests/widgets_table.rs
View file

@ -24,7 +24,7 @@
// Row::new(vec!["Row41", "Row42", "Row43"]),
// ])
// .header(Row::new(vec!["Head1", "Head2", "Head3"]).bottom_margin(1))
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .widths(&[
// Constraint::Length(5),
// Constraint::Length(5),
@ -122,7 +122,7 @@
// Row::new(vec!["Row41", "Row42", "Row43"]),
// ])
// .header(Row::new(vec!["Head1", "Head2", "Head3"]).bottom_margin(1))
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .widths(widths);
// f.render_widget(table, size);
// })
@ -210,7 +210,7 @@
// Row::new(vec!["Row41", "Row42", "Row43"]),
// ])
// .header(Row::new(vec!["Head1", "Head2", "Head3"]).bottom_margin(1))
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .widths(widths)
// .column_spacing(0);
// f.render_widget(table, size);
@ -316,7 +316,7 @@
// Row::new(vec!["Row41", "Row42", "Row43"]),
// ])
// .header(Row::new(vec!["Head1", "Head2", "Head3"]).bottom_margin(1))
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .widths(widths);
// f.render_widget(table, size);
// })
@ -425,7 +425,7 @@
// Row::new(vec!["Row41", "Row42", "Row43"]),
// ])
// .header(Row::new(vec!["Head1", "Head2", "Head3"]).bottom_margin(1))
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .widths(widths)
// .column_spacing(0);
// f.render_widget(table, size);
@ -530,7 +530,7 @@
// Row::new(vec!["Row41", "Row42", "Row43"]).height(2),
// ])
// .header(Row::new(vec!["Head1", "Head2", "Head3"]).bottom_margin(1))
// .block(Block::default().borders(Borders::ALL))
// .block(Block::bordered())
// .highlight_symbol(">> ")
// .widths(&[
// Constraint::Length(5),