mirror of https://github.com/helix-editor/helix
Truncate the start of file paths in the StatusLine (#1351)
* Truncate the start of file paths in the StatusLine * cargo fmt Co-authored-by: Bódi Balázs <97936@4ig.hu>pull/1385/head
parent
8aa0b8eacf
commit
60f3225c7f
|
@ -548,21 +548,6 @@ impl EditorView {
|
||||||
}
|
}
|
||||||
surface.set_string(viewport.x + 5, viewport.y, progress, base_style);
|
surface.set_string(viewport.x + 5, viewport.y, progress, base_style);
|
||||||
|
|
||||||
let rel_path = doc.relative_path();
|
|
||||||
let path = rel_path
|
|
||||||
.as_ref()
|
|
||||||
.map(|p| p.to_string_lossy())
|
|
||||||
.unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
|
|
||||||
|
|
||||||
let title = format!("{}{}", path, if doc.is_modified() { "[+]" } else { "" });
|
|
||||||
surface.set_stringn(
|
|
||||||
viewport.x + 8,
|
|
||||||
viewport.y,
|
|
||||||
title,
|
|
||||||
viewport.width.saturating_sub(6) as usize,
|
|
||||||
base_style,
|
|
||||||
);
|
|
||||||
|
|
||||||
//-------------------------------
|
//-------------------------------
|
||||||
// Right side of the status line.
|
// Right side of the status line.
|
||||||
//-------------------------------
|
//-------------------------------
|
||||||
|
@ -646,6 +631,31 @@ impl EditorView {
|
||||||
&right_side_text,
|
&right_side_text,
|
||||||
right_side_text.width() as u16,
|
right_side_text.width() as u16,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
//-------------------------------
|
||||||
|
// Middle / File path / Title
|
||||||
|
//-------------------------------
|
||||||
|
let title = {
|
||||||
|
let rel_path = doc.relative_path();
|
||||||
|
let path = rel_path
|
||||||
|
.as_ref()
|
||||||
|
.map(|p| p.to_string_lossy())
|
||||||
|
.unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
|
||||||
|
format!("{}{}", path, if doc.is_modified() { "[+]" } else { "" })
|
||||||
|
};
|
||||||
|
|
||||||
|
surface.set_string_truncated(
|
||||||
|
viewport.x + 8, // 8: 1 space + 3 char mode string + 1 space + 1 spinner + 1 space
|
||||||
|
viewport.y,
|
||||||
|
title,
|
||||||
|
viewport
|
||||||
|
.width
|
||||||
|
.saturating_sub(6)
|
||||||
|
.saturating_sub(right_side_text.width() as u16 + 1) as usize, // "+ 1": a space between the title and the selection info
|
||||||
|
base_style,
|
||||||
|
true,
|
||||||
|
true,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Handle events by looking them up in `self.keymaps`. Returns None
|
/// Handle events by looking them up in `self.keymaps`. Returns None
|
||||||
|
|
Loading…
Reference in New Issue