leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not draw scrollbar when not needed, draw background behind scrollbar

Browse source
This commit is contained in:
Jeremy Soller 2023-12-21 10:26:17 -07:00
parent ccec8e813b
commit 49149c3e17
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
2 changed files with 55 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/terminal.rs
View file

@ -242,16 +242,20 @@ impl Terminal {
)); ));
} }
pub fn scrollbar(&self) -> (f32, f32) { pub fn scrollbar(&self) -> Option<(f32, f32)> {
let term = self.term.lock(); let term = self.term.lock();
let grid = term.grid(); let grid = term.grid();
let total = grid.history_size() + grid.screen_lines(); if grid.history_size() > 0 {
let start = total - grid.display_offset() - grid.screen_lines(); let total = grid.history_size() + grid.screen_lines();
let end = total - grid.display_offset(); let start = total - grid.display_offset() - grid.screen_lines();
( let end = total - grid.display_offset();
(start as f32) / (total as f32), Some((
(end as f32) / (total as f32), (start as f32) / (total as f32),
) (end as f32) / (total as f32),
))
} else {
None
}
} }
pub fn update(&mut self) -> bool { pub fn update(&mut self) -> bool {

75
src/terminal_box.rs
View file

@ -208,7 +208,10 @@ where
let background_color = cosmic_text::Color(terminal.default_attrs().metadata as u32); let background_color = cosmic_text::Color(terminal.default_attrs().metadata as u32);
renderer.fill_quad( renderer.fill_quad(
Quad { Quad {
bounds: Rectangle::new(view_position, Size::new(view_w as f32, view_h as f32)), bounds: Rectangle::new(
view_position,
Size::new(view_w as f32 + scrollbar_w, view_h as f32),
),
border_radius: 0.0.into(), border_radius: 0.0.into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
@ -259,27 +262,30 @@ where
}); });
// Draw scrollbar // Draw scrollbar
let (start, end) = terminal.scrollbar(); if let Some((start, end)) = terminal.scrollbar() {
let scrollbar_y = start * view_h as f32; let scrollbar_y = start * view_h as f32;
let scrollbar_h = end * view_h as f32 - scrollbar_y; let scrollbar_h = end * view_h as f32 - scrollbar_y;
let scrollbar_rect = Rectangle::new( let scrollbar_rect = Rectangle::new(
[view_w as f32, scrollbar_y].into(), [view_w as f32, scrollbar_y].into(),
Size::new(scrollbar_w, scrollbar_h), Size::new(scrollbar_w, scrollbar_h),
); );
let scrollbar_alpha = match &state.dragging { let scrollbar_alpha = match &state.dragging {
Some(Dragging::Scrollbar { .. }) => 0.5, Some(Dragging::Scrollbar { .. }) => 0.5,
_ => 0.25, _ => 0.25,
}; };
renderer.fill_quad( renderer.fill_quad(
Quad { Quad {
bounds: scrollbar_rect + Vector::new(view_position.x, view_position.y), bounds: scrollbar_rect + Vector::new(view_position.x, view_position.y),
border_radius: 0.0.into(), border_radius: 0.0.into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
Color::new(1.0, 1.0, 1.0, scrollbar_alpha), Color::new(1.0, 1.0, 1.0, scrollbar_alpha),
); );
state.scrollbar_rect.set(scrollbar_rect); state.scrollbar_rect.set(scrollbar_rect);
} else {
state.scrollbar_rect.set(Rectangle::default())
}
let duration = instant.elapsed(); let duration = instant.elapsed();
log::debug!("redraw {}, {}: {:?}", view_w, view_h, duration); log::debug!("redraw {}, {}: {:?}", view_w, view_h, duration);
@ -466,19 +472,24 @@ where
state.click = Some((click_kind, Instant::now())); state.click = Some((click_kind, Instant::now()));
state.dragging = Some(Dragging::Buffer); state.dragging = Some(Dragging::Buffer);
} else if scrollbar_rect.contains(Point::new(x, y)) { } else if scrollbar_rect.contains(Point::new(x, y)) {
state.dragging = Some(Dragging::Scrollbar { if let Some(start_scroll) = terminal.scrollbar() {
start_y: y, state.dragging = Some(Dragging::Scrollbar {
start_scroll: terminal.scrollbar(), start_y: y,
}); start_scroll,
});
}
} else if x >= scrollbar_rect.x } else if x >= scrollbar_rect.x
&& x < (scrollbar_rect.x + scrollbar_rect.width) && x < (scrollbar_rect.x + scrollbar_rect.width)
{ {
let scroll_ratio = terminal.with_buffer(|buffer| y / buffer.size().1); if let Some(start_scroll) = terminal.scrollbar() {
terminal.scroll_to(scroll_ratio); let scroll_ratio =
state.dragging = Some(Dragging::Scrollbar { terminal.with_buffer(|buffer| y / buffer.size().1);
start_y: y, terminal.scroll_to(scroll_ratio);
start_scroll: terminal.scrollbar(), state.dragging = Some(Dragging::Scrollbar {
}); start_y: y,
start_scroll,
});
}
} }
} }