Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-30 19:39:09 +00:00
Code Issues Projects Releases Wiki Activity

fixed icons for grid details mode

Browse Source
This commit is contained in:
Alex Soderman 2018-04-01 20:43:08 -04:00
parent 68954f9142
commit f96a45f45e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/output/grid_details.rs
View File

@ -2,7 +2,7 @@
use std::io::{Write, Result as IOResult}; use std::io::{Write, Result as IOResult};
use ansi_term::ANSIStrings; use ansi_term::{ANSIGenericString, ANSIStrings};
use term_grid as grid; use term_grid as grid;
use fs::{Dir, File}; use fs::{Dir, File};
@ -17,7 +17,7 @@ use output::grid::Options as GridOptions;
use output::file_name::FileStyle; use output::file_name::FileStyle;
use output::table::{Table, Row as TableRow, Options as TableOptions}; use output::table::{Table, Row as TableRow, Options as TableOptions};
use output::tree::{TreeParams, TreeDepth}; use output::tree::{TreeParams, TreeDepth};
use output::icons::painted_icon;
#[derive(Debug)] #[derive(Debug)]
pub struct Options { pub struct Options {
@ -135,7 +135,17 @@ impl<'a> Render<'a> {
.collect::<Vec<TableRow>>(); .collect::<Vec<TableRow>>();
let file_names = self.files.iter() let file_names = self.files.iter()
.map(|file| self.style.for_file(file, self.colours).paint().promote()) .map(|file| {
if self.details.icons {
let mut icon_cell = TextCell::default();
icon_cell.push(ANSIGenericString::from(painted_icon(&file, &self.style)), 2);
let file_cell = self.style.for_file(file, self.colours).paint().promote();
icon_cell.append(file_cell);
icon_cell
} else {
self.style.for_file(file, self.colours).paint().promote()
}
})
.collect::<Vec<TextCell>>(); .collect::<Vec<TextCell>>();
let mut last_working_table = self.make_grid(1, options, git, &file_names, rows.clone(), &drender); let mut last_working_table = self.make_grid(1, options, git, &file_names, rows.clone(), &drender);