From 467af10c36b6806d82e2bb16bebc164a4a4a19a4 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Wed, 11 Dec 2019 01:01:24 -0500 Subject: Begin change of legend, and fixed scrolling issue caused by tui-fork drop --- src/canvas.rs | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src/canvas.rs') diff --git a/src/canvas.rs b/src/canvas.rs index 2e122a0a..cb586b33 100644 --- a/src/canvas.rs +++ b/src/canvas.rs @@ -103,6 +103,25 @@ pub fn draw_data(terminal: &mut Terminal, app_state: &mu .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) .split(vertical_chunks[2]); + // Component specific chunks + let cpu_chunk = Layout::default() + .direction(Direction::Horizontal) + .margin(0) + .constraints([Constraint::Percentage(90), Constraint::Percentage(10)].as_ref()) + .split(vertical_chunks[0]); + + let mem_chunk = Layout::default() + .direction(Direction::Horizontal) + .margin(0) + .constraints([Constraint::Percentage(90), Constraint::Percentage(10)].as_ref()) + .split(middle_chunks[0]); + + let network_chunk = Layout::default() + .direction(Direction::Horizontal) + .margin(0) + .constraints([Constraint::Percentage(90), Constraint::Percentage(10)].as_ref()) + .split(bottom_chunks[0]); + // Set up blocks and their components // CPU usage graph { @@ -226,7 +245,7 @@ pub fn draw_data(terminal: &mut Terminal, app_state: &mu // Temperature table { - let num_rows = i64::from(middle_divided_chunk_2[0].height) - 3; + let num_rows = i64::from(middle_divided_chunk_2[0].height) - 4; let start_position = get_start_position( num_rows, &(app_state.scroll_direction), @@ -270,7 +289,7 @@ pub fn draw_data(terminal: &mut Terminal, app_state: &mu // Disk usage table { - let num_rows = i64::from(middle_divided_chunk_2[1].height) - 3; + let num_rows = i64::from(middle_divided_chunk_2[1].height) - 4; let start_position = get_start_position( num_rows, &(app_state.scroll_direction), @@ -364,7 +383,7 @@ pub fn draw_data(terminal: &mut Terminal, app_state: &mu // * Show/hide elements based on scroll position // As such, we use a process_counter to know when we've hit the process we've currently scrolled to. We also need to move the list - we can // do so by hiding some elements! - let num_rows = i64::from(bottom_chunks[1].height) - 3; + let num_rows = i64::from(bottom_chunks[1].height) - 4; let start_position = get_start_position( num_rows, -- cgit v1.2.3