mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-03 10:57:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge d4cd336b44 into db187c4870

Browse source
This commit is contained in:
Adam Wierchoła 2025-03-31 10:16:32 -07:00 • committed by GitHub
commit fa88e10cca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
helix-term/src/ui/editor.rs
View file

@ -608,8 +608,9 @@ impl EditorView {
(!highlights.is_empty()).then_some(highlights)
}
/// Render bufferline at the top
pub fn render_bufferline(editor: &Editor, viewport: Rect, surface: &mut Surface) {
/// Render bufferline at the top. Returns height of the bufferline so
/// that the editor area can be clipped accordingly.
pub fn render_bufferline(editor: &Editor, viewport: Rect, surface: &mut Surface) -> u16 {
let scratch = PathBuf::from(SCRATCH_BUFFER_NAME); // default filename to use for scratch buffer
surface.clear_with(
viewport,
@ -632,6 +633,8 @@ impl EditorView {
let mut x = viewport.x;
let current_doc = view!(editor).doc;
let mut y = viewport.y;
for doc in editor.documents() {
let fname = doc
.path()
@ -651,14 +654,14 @@ impl EditorView {
let used_width = viewport.x.saturating_sub(x);
let rem_width = surface.area.width.saturating_sub(used_width);
x = surface
.set_stringn(x, viewport.y, text, rem_width as usize, style)
.0;
if x >= surface.area.right() {
break;
if x + text.len() as u16 >= surface.area.right() {
x = 0;
y += 1;
}
x = surface.set_stringn(x, y, text, rem_width as usize, style).0;
}
y + 1
}
pub fn render_gutter<'d>(
@ -1551,19 +1554,20 @@ impl Component for EditorView {
_ => false,
};
// -1 for commandline and -1 for bufferline
// -1 for commandline
let mut editor_area = area.clip_bottom(1);
if use_bufferline {
editor_area = editor_area.clip_top(1);
// -1 or more for the bufferline
editor_area = editor_area.clip_top(Self::render_bufferline(
cx.editor,
area.with_height(1),
surface,
));
}
// if the terminal size suddenly changed, we need to trigger a resize
cx.editor.resize(editor_area);
if use_bufferline {
Self::render_bufferline(cx.editor, area.with_height(1), surface);
}
for (view, is_focused) in cx.editor.tree.views() {
let doc = cx.editor.document(view.doc).unwrap();
self.render_view(cx.editor, doc, view, area, surface, is_focused);