Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed tab content crash, discovered a giant nest of new issues re: resizing

Browse source
This commit is contained in:
Mikayla Maki 2022-09-03 14:23:49 -07:00
parent 93d31e4152
commit cefc6e8705
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/terminal/src/terminal_container_view.rs
View file

@ -253,13 +253,19 @@ impl Item for TerminalContainer {
.as_ref() .as_ref()
.map(|fpi| { .map(|fpi| {
format!( format!(
"{} - {} {}", "{} - {}{}",
fpi.cwd fpi.cwd
.file_name() .file_name()
.map(|name| name.to_string_lossy().to_string()) .map(|name| name.to_string_lossy().to_string())
.unwrap_or_default(), .unwrap_or_default(),
fpi.name, fpi.name,
(&fpi.argv[1..]).join(" ") {
if fpi.argv.len() >= 1 {
format!(" {}", (&fpi.argv[1..]).join(" "))
} else {
"".to_string()
}
}
) )
}) })
.unwrap_or_else(|| "Terminal".to_string()), .unwrap_or_else(|| "Terminal".to_string()),
@ -463,8 +469,8 @@ impl SearchableItem for TerminalContainer {
Some(matches.len().saturating_sub(1)) Some(matches.len().saturating_sub(1))
} }
} else { } else {
// Matches found but no active selection, return the first one // Matches found but no active selection, return the first last one (closest to cursor)
Some(0) Some(matches.len().saturating_sub(1))
} }
} else { } else {
None None