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

Jump to bottom

Scrolling Bufferline #8362

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+125 −21
Open

Scrolling Bufferline #8362

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
762fd08
Added behaviour to wrap bufferline
CedricMeu Sep 22, 2023
2042eda
Added scrolling and extended bufferline configuration
CedricMeu Sep 23, 2023
6775315
Updated documentation
CedricMeu Sep 23, 2023
0415401
Cleaned up code
CedricMeu Sep 23, 2023
919f5af
Opinionated to scrolling
CedricMeu Sep 27, 2023
a1ec38a
Removed stray newline
CedricMeu Sep 27, 2023
0656f44
Merge branch 'master' into better-bufferline
CedricMeu Jun 21, 2024
cbbfb2f
Added markers to indicate under and overflow
CedricMeu Jun 21, 2024
319a002
Small cleanup
CedricMeu Jun 21, 2024
fab4fa7
Added `ui.bufferline.marker` key to style the underflow and overflow …
CedricMeu Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleaned up code
  • Loading branch information
@CedricMeu
CedricMeu committed Sep 23, 2023
commit 041540128549da90b2f9d13cf218e280da7bb3de
52 changes: 20 additions & 32 deletions helix-term/src/ui/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ impl EditorView {
let mut y = viewport.y as i32;
let current_doc = view!(editor).doc;

// Keep track of the tabs
// Gather info on buffertabs
let mut buffertabs = Vec::new();

let scratch = PathBuf::from(SCRATCH_BUFFER_NAME); // default filename to use for scratch buffer
Expand Down Expand Up @@ -609,7 +609,6 @@ impl EditorView {
(if x != 0 { y.saturating_add(1) } else { y } as u16).saturating_sub(viewport.y);

let viewport = viewport.with_height(height);

surface.clear_with(
viewport,
editor
Expand All @@ -621,44 +620,32 @@ impl EditorView {
if config.style == BufferLineStyle::Scroll {
let viewport_center = (viewport.width as f64 / 2.).floor() as i32 + viewport.x as i32;

let maybe_active_buffertab = buffertabs.iter().find(|tab| tab.active);
let active_buffertab = buffertabs.iter().find(|tab| tab.active).unwrap();

if let Some(tab) = maybe_active_buffertab {
log::debug!("Activae buffer found");
let active_buffertab_center = (tab.width as f64 / 2.).floor() as i32 + tab.x;
let active_buffertab_center =
(active_buffertab.width as f64 / 2.).floor() as i32 + active_buffertab.x;

let right_of_center = active_buffertab_center as i32 - viewport_center as i32;
let right_of_center = active_buffertab_center as i32 - viewport_center as i32;

log::debug!(
"Viewport center {}, tab center {}, right of center {}",
viewport_center,
active_buffertab_center,
right_of_center
);
if right_of_center > 0 {
let rightmost = buffertabs.last().unwrap();
let full_width = rightmost.x + rightmost.width as i32;

if right_of_center > 0 {
let rightmost = buffertabs.last().unwrap();
let full_width = rightmost.x + rightmost.width as i32;

let max_displacement = (full_width - viewport.width as i32).max(0);
let displacement = right_of_center.min(max_displacement);
log::debug!(
"Full width {}, max displacement {}, displacement {}",
full_width,
max_displacement,
displacement
);
let max_displacement = (full_width - viewport.width as i32).max(0);
let displacement = right_of_center.min(max_displacement);

for tab in buffertabs.iter_mut() {
tab.x = tab.x.saturating_sub(displacement.abs());
}
} // If on center, or left of center, nothing to do
} // If no active buffer, keep everything scrolled to leftmost
for tab in buffertabs.iter_mut() {
tab.x = tab.x.saturating_sub(displacement.abs());
}
} // If on center, or left of center, nothing to do
}

// Itterate over buffertabs, skip or slice them if left off screen, stop if right of screen.
// If wrapping no buffers will go off screen and all are drawn.
for tab in buffertabs.iter_mut() {
if tab.x < viewport.x as i32 {
if tab.x + tab.width as i32 > viewport.x as i32 {
// Draw on screen portion
let new_width = tab.width as i32 + tab.x;

tab.text = tab
Expand All @@ -671,15 +658,16 @@ impl EditorView {
tab.width -= new_width as u16;
tab.x = viewport.x as _;
} else {
// skip tabs completely of screen
// Skip tabs completely of screen
continue;
}
}
if tab.x > viewport.right() as i32 {
// Stop when off screen
// Stop when off screen to the right
break;
}

// Actually put the string on the screen
let _ = surface
.set_stringn(
tab.x as _,
Expand Down