Mirrors/ratatui
2
0
Fork 0
mirror of https://github.com/ratatui-org/ratatui synced 2024-11-10 07:04:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unify Item and Text

Browse source
This commit is contained in:
Antoine Büsch 2018-09-08 16:03:30 +10:00 committed by Florian Dehau
parent e42ab1fed8
commit f795173886
5 changed files with 31 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/demo.rs
View file

@ -19,7 +19,7 @@ use tui::layout::{Constraint, Direction, Layout, Rect};
use tui::style::{Color, Modifier, Style};
use tui::widgets::canvas::{Canvas, Line, Map, MapResolution};
use tui::widgets::{
Axis, BarChart, Block, Borders, Chart, Dataset, Gauge, Item, List, Marker, Paragraph, Row,
Axis, BarChart, Block, Borders, Chart, Dataset, Gauge, List, Marker, Paragraph, Row,
SelectableList, Sparkline, Table, Tabs, Text, Widget,
};
use tui::{Frame, Terminal};
@ -364,7 +364,7 @@ fn draw_charts(f: &mut Frame<MouseBackend>, app: &App, area: Rect) {
let error_style = Style::default().fg(Color::Magenta);
let critical_style = Style::default().fg(Color::Red);
let events = app.events.iter().map(|&(evt, level)| {
Item::StyledData(
Text::styled(
format!("{}: {}", level, evt),
match level {
"ERROR" => error_style,

4
examples/list.rs
View file

@ -12,7 +12,7 @@ use termion::input::TermRead;
use tui::backend::MouseBackend;
use tui::layout::{Constraint, Corner, Direction, Layout, Rect};
use tui::style::{Color, Modifier, Style};
use tui::widgets::{Block, Borders, Item, List, SelectableList, Widget};
use tui::widgets::{Block, Borders, List, SelectableList, Text, Widget};
use tui::Terminal;
struct App<'a> {
@ -188,7 +188,7 @@ fn draw(t: &mut Terminal<MouseBackend>, app: &App) -> Result<(), io::Error> {
.render(&mut f, chunks[0]);
{
let events = app.events.iter().map(|&(evt, level)| {
Item::StyledData(
Text::styled(
format!("{}: {}", level, evt),
match level {
"ERROR" => app.error_style,

4
examples/user_input.rs
View file

@ -22,7 +22,7 @@ use termion::input::TermRead;
use tui::backend::AlternateScreenBackend;
use tui::layout::{Constraint, Direction, Layout, Rect};
use tui::style::{Color, Style};
use tui::widgets::{Block, Borders, Item, List, Paragraph, Text, Widget};
use tui::widgets::{Block, Borders, List, Paragraph, Text, Widget};
use tui::Terminal;
struct App {
@ -122,7 +122,7 @@ fn draw(t: &mut Terminal<AlternateScreenBackend>, app: &App) -> Result<(), io::E
app.messages
.iter()
.enumerate()
.map(|(i, m)| Item::Data(format!("{}: {}", i, m))),
.map(|(i, m)| Text::raw(format!("{}: {}", i, m))),
).block(Block::default().borders(Borders::ALL).title("Messages"))
.render(&mut f, chunks[1]);
})

61
src/widgets/list.rs
View file

@ -1,4 +1,3 @@
use std::fmt::Display;
use std::iter;
use std::iter::Iterator;
@ -7,16 +6,11 @@ use unicode_width::UnicodeWidthStr;
use buffer::Buffer;
use layout::{Corner, Rect};
use style::Style;
use widgets::{Block, Widget};
use widgets::{Block, Text, Widget};
pub enum Item<D> {
Data(D),
StyledData(D, Style),
}
pub struct List<'b, L, D>
pub struct List<'b, L>
where
L: Iterator<Item = Item<D>>,
L: Iterator<Item = Text<'b>>,
{
block: Option<Block<'b>>,
items: L,
@ -24,11 +18,11 @@ where
start_corner: Corner,
}
impl<'b, L, D> Default for List<'b, L, D>
impl<'b, L> Default for List<'b, L>
where
L: Iterator<Item = Item<D>> + Default,
L: Iterator<Item = Text<'b>> + Default,
{
fn default() -> List<'b, L, D> {
fn default() -> List<'b, L> {
List {
block: None,
items: L::default(),
@ -38,11 +32,11 @@ where
}
}
impl<'b, L, D> List<'b, L, D>
impl<'b, L> List<'b, L>
where
L: Iterator<Item = Item<D>>,
L: Iterator<Item = Text<'b>>,
{
pub fn new(items: L) -> List<'b, L, D> {
pub fn new(items: L) -> List<'b, L> {
List {
block: None,
items,
@ -51,34 +45,33 @@ where
}
}
pub fn block(mut self, block: Block<'b>) -> List<'b, L, D> {
pub fn block(mut self, block: Block<'b>) -> List<'b, L> {
self.block = Some(block);
self
}
pub fn items<I>(mut self, items: I) -> List<'b, L, D>
pub fn items<I>(mut self, items: I) -> List<'b, L>
where
I: IntoIterator<Item = Item<D>, IntoIter = L>,
I: IntoIterator<Item = Text<'b>, IntoIter = L>,
{
self.items = items.into_iter();
self
}
pub fn style(mut self, style: Style) -> List<'b, L, D> {
pub fn style(mut self, style: Style) -> List<'b, L> {
self.style = style;
self
}
pub fn start_corner(mut self, corner: Corner) -> List<'b, L, D> {
pub fn start_corner(mut self, corner: Corner) -> List<'b, L> {
self.start_corner = corner;
self
}
}
impl<'b, L, D> Widget for List<'b, L, D>
impl<'b, L> Widget for List<'b, L>
where
L: Iterator<Item = Item<D>>,
D: Display,
L: Iterator<Item = Text<'b>>,
{
fn draw(&mut self, area: Rect, buf: &mut Buffer) {
let list_area = match self.block {
@ -108,17 +101,11 @@ where
_ => (list_area.left(), list_area.top() + i as u16),
};
match item {
Item::Data(ref v) => {
buf.set_stringn(
x,
y,
format!("{}", v),
list_area.width as usize,
Style::default(),
);
Text::Raw(ref v) => {
buf.set_stringn(x, y, v, list_area.width as usize, Style::default());
}
Item::StyledData(ref v, s) => {
buf.set_stringn(x, y, format!("{}", v), list_area.width as usize, s);
Text::Styled(ref v, s) => {
buf.set_stringn(x, y, v, list_area.width as usize, s);
}
};
}
@ -239,15 +226,15 @@ impl<'b> Widget for SelectableList<'b> {
.items
.iter()
.enumerate()
.map(|(i, item)| {
.map(|(i, &item)| {
if let Some(s) = selected {
if i == s {
Item::StyledData(format!("{} {}", highlight_symbol, item), highlight_style)
Text::styled(format!("{} {}", highlight_symbol, item), highlight_style)
} else {
Item::StyledData(format!("{} {}", blank_symbol, item), self.style)
Text::styled(format!("{} {}", blank_symbol, item), self.style)
}
} else {
Item::StyledData(item.to_string(), self.style)
Text::styled(item, self.style)
}
})
.skip(offset as usize);

2
src/widgets/mod.rs
View file

@ -15,7 +15,7 @@ pub use self::barchart::BarChart;
pub use self::block::Block;
pub use self::chart::{Axis, Chart, Dataset, Marker};
pub use self::gauge::Gauge;
pub use self::list::{Item, List, SelectableList};
pub use self::list::{List, SelectableList};
pub use self::paragraph::Paragraph;
pub use self::sparkline::Sparkline;
pub use self::table::{Row, Table};