mredaelli
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: fix pager scrolling getting stuck

embed
Manos Pitsidianakis 2019-05-12 00:40:44 +03:00
parent 5d6c4ee2c8
commit 6e7ab0421b
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/src/components/utilities.rs
View File

@ -446,13 +446,8 @@ impl Component for Pager {
self.cursor_pos = self.cursor_pos.saturating_sub(height);
}
PageMovement::PageDown => {
/* This might "overflow" beyond the max_cursor_pos boundary if it's not yet
* set. TODO: Rework the page up/down stuff
*/
if self.cursor_pos + 2 * height + 1 < self.height {
if self.cursor_pos + height < self.height {
self.cursor_pos += height;
} else {
self.cursor_pos = self.height.saturating_sub(height).saturating_sub(1);
}
}
}
@ -462,18 +457,6 @@ impl Component for Pager {
return;
}
match self.max_cursor_pos {
Some(max) if max <= self.cursor_pos => {
self.cursor_pos -= 1;
return;
}
Some(max) if max >= height => {
self.cursor_pos = 0;
return;
}
_ => {}
}
clear_area(grid, area);
//let pager_context: usize = context.settings.pager.pager_context;
//let pager_stop: bool = context.settings.pager.pager_stop;
@ -489,16 +472,15 @@ impl Component for Pager {
self.content = CellBuffer::new(width, height, Cell::with_char(' '));
Pager::print_string(&mut self.content, lines);
}
if self.cursor_pos + height >= self.height {
self.cursor_pos = self.height.saturating_sub(height);
};
let pos = copy_area_with_break(
grid,
&self.content,
area,
((0, self.cursor_pos), (self.width - 1, self.height - 1)),
);
if pos.1 < get_y(bottom_right!(area)) {
self.max_cursor_pos = Some(self.height + 1);
}
context.dirty_areas.push_back(area);
}
fn process_event(&mut self, event: &mut UIEvent, context: &mut Context) -> bool {