Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix infinite scroll in process details area #71

Merged
merged 3 commits into from
Sep 23, 2024
Merged

Fix infinite scroll in process details area #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d54a69d
Rename Tui.process_table_scroll to process_table_scroll_state to make…
grouzen Sep 21, 2024
cba3d8d
Fix infinite scroll in process details area
grouzen Sep 21, 2024
99e3323
Fix formatting
grouzen Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/tui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ impl App {
self.search_results = self
.process_manager
.find_processes(self.tui.search_input_text(), self.filter_options);
self.tui.update_number_of_items(self.search_results.len());
self.tui
.update_process_table_number_of_items(self.search_results.len());
}

fn delete_char(&mut self) {
Expand All @@ -62,7 +63,8 @@ impl App {
self.search_results.remove(pid);
//TODO: this must be here because details will show 1/0 when removed!
// seems like this can only be fixed by autorefresh!
self.tui.update_number_of_items(self.search_results.len());
self.tui
.update_process_table_number_of_items(self.search_results.len());
} else {
self.tui
.set_error_message("Failed to kill process, check permissions");
Expand Down Expand Up @@ -119,7 +121,7 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Result<(
app.search_for_processess()
}
Char('f') if key.modifiers.contains(KeyModifiers::CONTROL) => {
app.tui.process_details_down()
app.tui.process_details_down(&mut terminal.get_frame())
}
Char('b') if key.modifiers.contains(KeyModifiers::CONTROL) => {
app.tui.process_details_up()
Expand Down
107 changes: 71 additions & 36 deletions src/tui/rendering.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::borrow::Cow;
use std::{borrow::Cow, rc::Rc};

use crossterm::event::KeyEvent;
use ratatui::{
Expand Down Expand Up @@ -37,12 +37,13 @@ impl Theme {
}

pub struct Tui {
process_table: TableState,
process_table_scroll: ScrollbarState,
theme: Theme,
number_of_items: usize,
details_scroll_state: ScrollbarState,
process_details_scroll: u16,
process_table: TableState,
process_table_scroll_state: ScrollbarState,
process_table_number_of_items: usize,
process_details_scroll_state: ScrollbarState,
process_details_scroll_offset: u16,
process_details_number_of_lines: u16,
jacek-kurlit marked this conversation as resolved.
Show resolved Hide resolved
search_area: TextArea<'static>,
error_message: Option<&'static str>,
}
Expand All @@ -53,12 +54,13 @@ impl Tui {
search_area.move_cursor(tui_textarea::CursorMove::End);
Self {
process_table: TableState::default(),
process_table_scroll: ScrollbarState::new(0),
process_table_scroll_state: ScrollbarState::new(0),
theme: Theme::new(),
number_of_items: 0,
process_details_scroll: 0,
process_table_number_of_items: 0,
process_details_scroll_offset: 0,
process_details_number_of_lines: 0,
//NOTE: we don't update this, value 1 means that this should be rendered
details_scroll_state: ScrollbarState::new(1),
process_details_scroll_state: ScrollbarState::new(1),
search_area,
error_message: None,
}
Expand All @@ -67,26 +69,26 @@ impl Tui {
pub fn select_next_row(&mut self) {
let next_row_index = self.process_table.selected().map(|i| {
let mut i = i + 1;
if i >= self.number_of_items {
if i >= self.process_table_number_of_items {
i = 0
}
i
});
self.process_table.select(next_row_index);
self.process_table_scroll = self
.process_table_scroll
self.process_table_scroll_state = self
.process_table_scroll_state
.position(next_row_index.unwrap_or(0));
self.reset_process_detals_scroll();
}

pub fn select_previous_row(&mut self) {
let previous_index = self.process_table.selected().map(|i| {
let i = i.wrapping_sub(1);
i.clamp(0, self.number_of_items.saturating_sub(1))
i.clamp(0, self.process_table_number_of_items.saturating_sub(1))
});
self.process_table.select(previous_index);
self.process_table_scroll = self
.process_table_scroll
self.process_table_scroll_state = self
.process_table_scroll_state
.position(previous_index.unwrap_or(0));
self.reset_process_detals_scroll();
}
Expand All @@ -99,16 +101,25 @@ impl Tui {
self.search_area.insert_char(new_char);
}

pub fn process_details_down(&mut self) {
self.process_details_scroll = self.process_details_scroll.saturating_add(1);
pub fn process_details_down(&mut self, frame: &mut Frame) {
jacek-kurlit marked this conversation as resolved.
Show resolved Hide resolved
let rects = layout_rects(frame);
let process_details_area = rects[2];
let area_content_height = process_details_area.height - 2;
let content_scrolled =
self.process_details_number_of_lines - self.process_details_scroll_offset;

if content_scrolled > area_content_height {
self.process_details_scroll_offset =
self.process_details_scroll_offset.saturating_add(1);
}
}

pub fn process_details_up(&mut self) {
self.process_details_scroll = self.process_details_scroll.saturating_sub(1);
self.process_details_scroll_offset = self.process_details_scroll_offset.saturating_sub(1);
}

fn reset_process_detals_scroll(&mut self) {
self.process_details_scroll = 0;
self.process_details_scroll_offset = 0;
}

pub fn set_error_message(&mut self, message: &'static str) {
Expand All @@ -127,10 +138,10 @@ impl Tui {
self.process_table.selected()
}

pub fn update_number_of_items(&mut self, number_of_items: usize) {
self.number_of_items = number_of_items;
self.process_table_scroll = self
.process_table_scroll
pub fn update_process_table_number_of_items(&mut self, number_of_items: usize) {
jacek-kurlit marked this conversation as resolved.
Show resolved Hide resolved
self.process_table_number_of_items = number_of_items;
self.process_table_scroll_state = self
.process_table_scroll_state
.content_length(number_of_items.saturating_sub(1));
if number_of_items == 0 {
self.process_table.select(None);
Expand All @@ -144,18 +155,10 @@ impl Tui {
}

pub fn render_ui(&mut self, search_results: &ProcessSearchResults, frame: &mut Frame) {
let rects = Layout::vertical([
Constraint::Length(1),
Constraint::Min(10),
Constraint::Max(7),
Constraint::Length(1),
])
.split(frame.area());
let rects = layout_rects(frame);

self.render_search_input(frame, rects[0]);

self.render_process_table(frame, search_results, rects[1]);

self.render_process_details(frame, search_results, rects[2]);

render_help(frame, self.error_message, rects[3]);
Expand Down Expand Up @@ -246,7 +249,7 @@ impl Tui {
vertical: 1,
horizontal: 1,
}),
&mut self.process_table_scroll,
&mut self.process_table_scroll_state,
);
}

Expand All @@ -258,6 +261,9 @@ impl Tui {
) {
let selected_process = search_results.nth(self.get_selected_row_index());
let lines = process_details_lines(selected_process);

self.update_process_details_number_of_lines(area, selected_process);
jacek-kurlit marked this conversation as resolved.
Show resolved Hide resolved

let info_footer = Paragraph::new(lines)
.wrap(Wrap { trim: false })
.left_aligned()
Expand All @@ -272,7 +278,7 @@ impl Tui {
// .border_style(Style::new().fg(app.colors.footer_border_color))
.border_type(BorderType::Rounded),
)
.scroll((self.process_details_scroll, 0));
.scroll((self.process_details_scroll_offset, 0));
f.render_widget(info_footer, area);
f.render_stateful_widget(
Scrollbar::default()
Expand All @@ -282,9 +288,28 @@ impl Tui {
.begin_symbol(Some("↑"))
.end_symbol(Some("↓")),
area,
&mut self.details_scroll_state,
&mut self.process_details_scroll_state,
);
}

fn update_process_details_number_of_lines(
&mut self,
area: Rect,
selected_process: Option<&Process>,
) {
let content_width = area.width - 2;

match selected_process {
Some(process) => {
let args_number_of_lines =
(process.args.chars().count() as u16 / content_width) + 1;
self.process_details_number_of_lines = args_number_of_lines + 2;
}
None => {
self.process_details_number_of_lines = 1;
}
}
}
}

fn dynamic_search_column(search_result: &ProcessSearchResults) -> (&str, fn(&Process) -> &str) {
Expand Down Expand Up @@ -341,3 +366,13 @@ fn render_help(f: &mut Frame, error_message: Option<&str>, area: Rect) {
f.render_widget(error, rects[0]);
f.render_widget(help, rects[1]);
}

fn layout_rects(frame: &mut Frame) -> Rc<[Rect]> {
Layout::vertical([
Constraint::Length(1),
Constraint::Min(10),
Constraint::Max(7),
Constraint::Length(1),
])
.split(frame.area())
}