Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bufferline wrapping #8324

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add bufferline wrapping #8324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions helix-term/src/ui/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,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,
Expand All @@ -637,6 +638,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()
Expand All @@ -656,14 +659,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>(
Expand Down Expand Up @@ -1550,19 +1553,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);
Expand Down
Loading