itsscb/ratatui
1
0
Fork 0
mirror of https://github.com/ratatui/ratatui.git synced 2025-09-30 22:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix build

Browse Source
This commit is contained in:
Florian Dehau 2021-10-17 17:12:50 +02:00
parent 4845c03eec
commit 8c1f58079f
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,8 +1,10 @@
# Changelog # Changelog
## To be released ## To be released
### Features ### Features
* Add option to `widgets::List` to repeat the hightlight symbol for each line of multi-line items.
* Add option to `widgets::List` to repeat the hightlight symbol for each line of multi-line items (#533).
## v0.16.0 - 2021-08-01 ## v0.16.0 - 2021-08-01

12
src/widgets/list.rs
View File

@ -126,7 +126,7 @@ impl<'a> List<'a> {
self.highlight_style = style; self.highlight_style = style;
self self
} }
pub fn repeat_highlight_symbol(mut self, repeat: bool) -> List<'a> { pub fn repeat_highlight_symbol(mut self, repeat: bool) -> List<'a> {
self.repeat_highlight_symbol = repeat; self.repeat_highlight_symbol = repeat;
self self
@ -239,13 +239,19 @@ impl<'a> StatefulWidget for List<'a> {
// if the item is selected, we need to display the hightlight symbol: // if the item is selected, we need to display the hightlight symbol:
// - either for the first line of the item only, // - either for the first line of the item only,
// - or for each line of the item if the appropriate option is set // - or for each line of the item if the appropriate option is set
let symbol = if is_selected && (j == 0 || self.repeat_highlight_symbol){ let symbol = if is_selected && (j == 0 || self.repeat_highlight_symbol) {
highlight_symbol highlight_symbol
} else { } else {
&blank_symbol &blank_symbol
}; };
let (elem_x, max_element_width) = if has_selection { let (elem_x, max_element_width) = if has_selection {
let (elem_x, _) = buf.set_stringn(x, y + j as u16, symbol, list_area.width as usize, item_style); let (elem_x, _) = buf.set_stringn(
x,
y + j as u16,
symbol,
list_area.width as usize,
item_style,
);
(elem_x, (list_area.width - (elem_x - x)) as u16) (elem_x, (list_area.width - (elem_x - x)) as u16)
} else { } else {
(x, list_area.width) (x, list_area.width)

7
tests/widgets_list.rs
View File

@ -4,6 +4,7 @@ use tui::{
layout::Rect, layout::Rect,
style::{Color, Style}, style::{Color, Style},
symbols, symbols,
text::Spans,
widgets::{Block, Borders, List, ListItem, ListState}, widgets::{Block, Borders, List, ListItem, ListState},
Terminal, Terminal,
}; };
@ -153,7 +154,8 @@ fn widgets_list_should_display_multiline_items() {
">> Item 2 ", ">> Item 2 ",
" Item 2b", " Item 2b",
" Item 3 ", " Item 3 ",
" Item 3c"]); " Item 3c",
]);
for x in 0..10 { for x in 0..10 {
expected.get_mut(x, 2).set_bg(Color::Yellow); expected.get_mut(x, 2).set_bg(Color::Yellow);
expected.get_mut(x, 3).set_bg(Color::Yellow); expected.get_mut(x, 3).set_bg(Color::Yellow);
@ -188,7 +190,8 @@ fn widgets_list_should_repeat_highlight_symbol() {
">> Item 2 ", ">> Item 2 ",
">> Item 2b", ">> Item 2b",
" Item 3 ", " Item 3 ",
" Item 3c"]); " Item 3c",
]);
for x in 0..10 { for x in 0..10 {
expected.get_mut(x, 2).set_bg(Color::Yellow); expected.get_mut(x, 2).set_bg(Color::Yellow);
expected.get_mut(x, 3).set_bg(Color::Yellow); expected.get_mut(x, 3).set_bg(Color::Yellow);