s3rius/awatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed grid rendering.

Browse Source 
Signed-off-by: Pavel Kirilin <win10@list.ru>
This commit is contained in:
Pavel Kirilin
2020-04-01 11:02:01 +04:00
parent 02344c86f9
commit 60b10d9dd0
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/tty_stuff.rs
View File

@ -8,7 +8,7 @@ use term_grid::{Grid, GridOptions, Filling, Direction, Cell};
use std::process::exit;
use std::str::FromStr;
pub fn get_matched_files_grid(pattern: String) -> AppResult<String> {
pub fn get_matched_files_grid(pattern: String, screen_width: u16) -> AppResult<String> {
let mut grid = Grid::new(GridOptions {
direction: Direction::LeftToRight,
filling: Filling::Spaces(2),
@ -17,7 +17,11 @@ pub fn get_matched_files_grid(pattern: String) -> AppResult<String> {
for filename in filenames {
grid.add(Cell::from(filename))
}
Ok(format!("{}", grid.fit_into_columns(6)))
if let Some(grid) = grid.fit_into_width(screen_width as usize) {
Ok(format!("{}", grid))
} else {
Ok(String::new())
}
}
pub fn choose_pattern(current_pattern: String) -> AppResult<String> {
@ -29,16 +33,21 @@ pub fn choose_pattern(current_pattern: String) -> AppResult<String> {
|stdout, pattern| {
if !pattern.is_empty() {
write!(stdout, "{}------Matched files------", termion::cursor::Goto(1, 3))?;
let grid = get_matched_files_grid(pattern)?;
let (col, _) = termion::terminal_size()?;
let grid = get_matched_files_grid(pattern, col)?;
if grid.is_empty() {
write!(stdout, "{}No matches found",
termion::cursor::Goto(1, 4)
)?;
} else {
write!(stdout, "{}{}",
termion::cursor::Goto(1, 4),
grid
)?;
for line in grid.lines() {
write!(stdout, "{}{}{}{}",
termion::cursor::Down(1),
termion::clear::CurrentLine,
termion::cursor::Left(col),
line
)?;
}
}
}
Ok(())