Mirrors/bottom
2
0
Fork 0
mirror of https://github.com/ClementTsang/bottom synced 2024-11-26 22:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: minor tweak to update_position code

Browse source
This commit is contained in:
ClementTsang 2022-08-15 00:50:27 -04:00
parent f5e2b7242a
commit 658b8c720f
No known key found for this signature in database
GPG key ID: DC3B7867D8D97095
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/text_table/state.rs
View file

@ -472,9 +472,12 @@ impl<H: TableComponentHeader> TableComponentState<H> {
/// Updates the position if possible, and if there is a valid change, returns the new position. /// Updates the position if possible, and if there is a valid change, returns the new position.
pub fn update_position(&mut self, change: i64, num_entries: usize) -> Option<usize> { pub fn update_position(&mut self, change: i64, num_entries: usize) -> Option<usize> {
let min_index = 0;
let max_index = num_entries.saturating_sub(1);
if change == 0 if change == 0
|| (change > 0 && self.current_scroll_position == num_entries.saturating_sub(1)) || (change > 0 && self.current_scroll_position == max_index)
|| (change < 0 && self.current_scroll_position == 0) || (change < 0 && self.current_scroll_position == min_index)
{ {
return None; return None;
} }
@ -482,7 +485,7 @@ impl<H: TableComponentHeader> TableComponentState<H> {
let csp: Result<i64, _> = self.current_scroll_position.try_into(); let csp: Result<i64, _> = self.current_scroll_position.try_into();
if let Ok(csp) = csp { if let Ok(csp) = csp {
self.current_scroll_position = self.current_scroll_position =
(csp + change).clamp(0, num_entries.saturating_sub(1) as i64) as usize; (csp + change).clamp(min_index as i64, max_index as i64) as usize;
if change < 0 { if change < 0 {
self.scroll_direction = ScrollDirection::Up; self.scroll_direction = ScrollDirection::Up;
@ -490,12 +493,12 @@ impl<H: TableComponentHeader> TableComponentState<H> {
self.scroll_direction = ScrollDirection::Down; self.scroll_direction = ScrollDirection::Down;
} }
return Some(self.current_scroll_position); Some(self.current_scroll_position)
} } else {
None None
} }
} }
}
#[cfg(test)] #[cfg(test)]
mod test { mod test {