meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

utilities: Fix incorrect calculations in ScrollBar

jmap-eventsource
Manos Pitsidianakis 2020-11-23 17:32:06 +02:00
parent 31e4ed006d
commit f25f93fccf
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/components/utilities/widgets.rs
View File

@ -1028,7 +1028,7 @@ impl AutoComplete {
} }
} }
#[derive(Default)] #[derive(Default, Copy, Clone)]
pub struct ScrollBar { pub struct ScrollBar {
pub show_arrows: bool, pub show_arrows: bool,
} }
@ -1051,34 +1051,22 @@ impl ScrollBar {
if length == 0 { if length == 0 {
return; return;
} }
let mut height = height!(area); let height = height!(area);
if height < 3 { if height < 3 {
return; return;
} }
clear_area(grid, area, crate::conf::value(context, "theme_default")); clear_area(grid, area, crate::conf::value(context, "theme_default"));
let visible_ratio: f64 = (std::cmp::min(visible_rows, length) as f64) / (length as f64); let visible_rows = std::cmp::min(visible_rows, length);
let scrollbar_height = std::cmp::min( let ascii_drawing = grid.ascii_drawing;
height.saturating_sub(1), let ratio: f64 = (height as f64) / (length as f64);
std::cmp::max((visible_ratio * (height as f64)) as usize, 1), let scrollbar_height = (ratio * (visible_rows as f64)) as usize;
); let scrollbar_offset = (ratio * (pos as f64)) as usize;
if self.show_arrows {
height -= 3;
}
let scrollbar_offset = {
let temp = (((pos as f64) / (length as f64)) * (height as f64)) as usize;
if scrollbar_height + temp > height {
height.saturating_sub(scrollbar_height)
} else {
temp
}
};
let (mut upper_left, bottom_right) = area; let (mut upper_left, bottom_right) = area;
if self.show_arrows { if self.show_arrows {
grid[upper_left] grid[upper_left]
.set_ch('▄') .set_ch(if ascii_drawing { 'o' } else { '▀' })
.set_fg(crate::conf::value(context, "widgets.options.highlighted").bg); .set_fg(crate::conf::value(context, "widgets.options.highlighted").bg);
upper_left = pos_inc(upper_left, (0, 1)); upper_left = pos_inc(upper_left, (0, 1));
} }
@ -1089,8 +1077,8 @@ impl ScrollBar {
upper_left = pos_inc(upper_left, (0, 1)); upper_left = pos_inc(upper_left, (0, 1));
} }
if self.show_arrows { if self.show_arrows {
grid[pos_dec(bottom_right, (0, 1))] grid[bottom_right]
.set_ch('▀') .set_ch(if ascii_drawing { 'o' } else { '▄' })
.set_fg(crate::conf::value(context, "widgets.options.highlighted").bg) .set_fg(crate::conf::value(context, "widgets.options.highlighted").bg)
.set_bg(crate::conf::value(context, "theme_default").bg); .set_bg(crate::conf::value(context, "theme_default").bg);
} }
@ -1108,44 +1096,36 @@ impl ScrollBar {
if length == 0 { if length == 0 {
return; return;
} }
let mut width = width!(area); let width = width!(area);
if width < 3 { if width < 3 {
return; return;
} }
clear_area(grid, area, crate::conf::value(context, "theme_default")); clear_area(grid, area, crate::conf::value(context, "theme_default"));
let visible_ratio: f64 = (std::cmp::min(visible_cols, length) as f64) / (length as f64); let visible_cols = std::cmp::min(visible_cols, length);
let scrollbar_width = std::cmp::max((visible_ratio * (width as f64)) as usize, 1); let ascii_drawing = grid.ascii_drawing;
if self.show_arrows { let ratio: f64 = (width as f64) / (length as f64);
width -= 3; let scrollbar_width = (ratio * (visible_cols as f64)) as usize;
} let scrollbar_offset = (ratio * (pos as f64)) as usize;
let scrollbar_offset = {
let temp = (((pos as f64) / (length as f64)) * (width as f64)) as usize;
if scrollbar_width + temp > width {
width.saturating_sub(scrollbar_width)
} else {
temp
}
};
let (mut upper_left, bottom_right) = area; let (mut upper_left, bottom_right) = area;
if self.show_arrows { if self.show_arrows {
grid[upper_left] grid[upper_left]
.set_ch('▐') .set_ch(if ascii_drawing { 'I' } else { '▐' })
.set_fg(crate::conf::value(context, "widgets.options.highlighted").bg); .set_fg(crate::conf::value(context, "widgets.options.highlighted").bg);
upper_left = pos_inc(upper_left, (1, 0)); upper_left = pos_inc(upper_left, (1, 0));
} }
upper_left = pos_inc(upper_left, (scrollbar_offset, 0)); upper_left = pos_inc(upper_left, (scrollbar_offset, 0));
for _ in 0..=scrollbar_width { for _ in 0..scrollbar_width {
grid[upper_left] grid[upper_left]
.set_ch('█') .set_ch(if ascii_drawing { 'H' } else { '█' })
.set_fg(crate::conf::value(context, "widgets.options.highlighted").bg); .set_fg(crate::conf::value(context, "widgets.options.highlighted").bg);
upper_left = pos_inc(upper_left, (1, 0)); upper_left = pos_inc(upper_left, (1, 0));
} }
if self.show_arrows { if self.show_arrows {
grid[pos_dec(bottom_right, (1, 0))] grid[bottom_right]
.set_ch('▌') .set_ch(if ascii_drawing { 'I' } else { '▌' })
.set_fg(crate::conf::value(context, "widgets.options.highlighted").bg) .set_fg(crate::conf::value(context, "widgets.options.highlighted").bg)
.set_bg(crate::conf::value(context, "theme_default").bg); .set_bg(crate::conf::value(context, "theme_default").bg);
} }