Popup scrollbar (#4449)

* init

* cargo fmt

* optimisation of the scrollbar render both for Menu and Popup. Toggling off scrollbar for Popup<Menu>, since Menu has its own

* rendering scroll track

* removed unnecessary cast

* improve memory allocation

* small correction
pull/4747/head
Manos Mertzianis 2 years ago committed by GitHub
parent 3b7760dfb0
commit 77be98c783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -598,7 +598,7 @@ pub fn code_action(cx: &mut Context) {
}); });
picker.move_down(); // pre-select the first item picker.move_down(); // pre-select the first item
let popup = Popup::new("code-action", picker); let popup = Popup::new("code-action", picker).with_scrollbar(false);
compositor.replace_or_push("code-action", popup); compositor.replace_or_push("code-action", popup);
}, },
) )

@ -227,7 +227,7 @@ impl Completion {
} }
}; };
}); });
let popup = Popup::new(Self::ID, menu); let popup = Popup::new(Self::ID, menu).with_scrollbar(false);
let mut completion = Self { let mut completion = Self {
popup, popup,
start_offset, start_offset,

@ -320,11 +320,6 @@ impl<T: Item + 'static> Component for Menu<T> {
(a + b - 1) / b (a + b - 1) / b
} }
let scroll_height = std::cmp::min(div_ceil(win_height.pow(2), len), win_height as usize);
let scroll_line = (win_height - scroll_height) * scroll
/ std::cmp::max(1, len.saturating_sub(win_height));
let rows = options.iter().map(|option| option.row(&self.editor_data)); let rows = options.iter().map(|option| option.row(&self.editor_data));
let table = Table::new(rows) let table = Table::new(rows)
.style(style) .style(style)
@ -357,20 +352,24 @@ impl<T: Item + 'static> Component for Menu<T> {
let fits = len <= win_height; let fits = len <= win_height;
let scroll_style = theme.get("ui.menu.scroll"); let scroll_style = theme.get("ui.menu.scroll");
for (i, _) in (scroll..(scroll + win_height).min(len)).enumerate() { if !fits {
let cell = &mut surface[(area.x + area.width - 1, area.y + i as u16)]; let scroll_height = div_ceil(win_height.pow(2), len).min(win_height);
let scroll_line = (win_height - scroll_height) * scroll
/ std::cmp::max(1, len.saturating_sub(win_height));
if !fits { let mut cell;
// Draw scroll track for i in 0..win_height {
cell.set_symbol("▐"); // right half block cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
}
let is_marked = i >= scroll_line && i < scroll_line + scroll_height; cell.set_symbol("▐"); // right half block
if !fits && is_marked { if scroll_line <= i && i < scroll_line + scroll_height {
// Draw scroll thumb // Draw scroll thumb
cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset)); cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
} else {
// Draw scroll track
cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
}
} }
} }
} }

@ -22,6 +22,7 @@ pub struct Popup<T: Component> {
auto_close: bool, auto_close: bool,
ignore_escape_key: bool, ignore_escape_key: bool,
id: &'static str, id: &'static str,
has_scrollbar: bool,
} }
impl<T: Component> Popup<T> { impl<T: Component> Popup<T> {
@ -37,6 +38,7 @@ impl<T: Component> Popup<T> {
auto_close: false, auto_close: false,
ignore_escape_key: false, ignore_escape_key: false,
id, id,
has_scrollbar: true,
} }
} }
@ -128,6 +130,14 @@ impl<T: Component> Popup<T> {
} }
} }
/// Toggles the Popup's scrollbar.
/// Consider disabling the scrollbar in case the child
/// already has its own.
pub fn with_scrollbar(mut self, enable_scrollbar: bool) -> Self {
self.has_scrollbar = enable_scrollbar;
self
}
pub fn contents(&self) -> &T { pub fn contents(&self) -> &T {
&self.contents &self.contents
} }
@ -228,6 +238,40 @@ impl<T: Component> Component for Popup<T> {
let inner = area.inner(&self.margin); let inner = area.inner(&self.margin);
self.contents.render(inner, surface, cx); self.contents.render(inner, surface, cx);
// render scrollbar if contents do not fit
if self.has_scrollbar {
let win_height = inner.height as usize;
let len = self.child_size.1 as usize;
let fits = len <= win_height;
let scroll = self.scroll;
let scroll_style = cx.editor.theme.get("ui.menu.scroll");
const fn div_ceil(a: usize, b: usize) -> usize {
(a + b - 1) / b
}
if !fits {
let scroll_height = div_ceil(win_height.pow(2), len).min(win_height);
let scroll_line = (win_height - scroll_height) * scroll
/ std::cmp::max(1, len.saturating_sub(win_height));
let mut cell;
for i in 0..win_height {
cell = &mut surface[(inner.right() - 1, inner.top() + i as u16)];
cell.set_symbol("▐"); // right half block
if scroll_line <= i && i < scroll_line + scroll_height {
// Draw scroll thumb
cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
} else {
// Draw scroll track
cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
}
}
}
}
} }
fn id(&self) -> Option<&'static str> { fn id(&self) -> Option<&'static str> {

Loading…
Cancel
Save