diff options
| author | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-02-17 23:28:06 -0500 |
|---|---|---|
| committer | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-02-17 23:48:27 -0500 |
| commit | 47b78d22f848d9bfccc2176cc6bc84fb2b636de7 (patch) | |
| tree | 8c1408d1f548302b8bfb80e112821dd4dd852081 | |
| parent | 48d2afc54ac0f491cc68751590dc89935b64369e (diff) | |
Sanity checks as we approach release... bug patching:
* Fix for freeze not working (due to change with how we eat data)
* Fix for typos with newlines
* Made help box larger
* Made dd box larger
| -rw-r--r-- | src/canvas.rs | 22 | ||||
| -rw-r--r-- | src/constants.rs | 2 | ||||
| -rw-r--r-- | src/main.rs | 4 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/canvas.rs b/src/canvas.rs index b53ac99c..af8f08ed 100644 --- a/src/canvas.rs +++ b/src/canvas.rs @@ -140,6 +140,8 @@ impl Painter { ); } + // TODO: [REFACTOR] We should clean this up tbh + #[allow(clippy::cognitive_complexity)] pub fn draw_data<B: backend::Backend>( &mut self, terminal: &mut Terminal<B>, app_state: &mut app::App, ) -> error::Result<()> { @@ -152,9 +154,9 @@ impl Painter { .margin(1) .constraints( [ - Constraint::Percentage(30), - Constraint::Percentage(40), - Constraint::Percentage(30), + Constraint::Percentage(20), + Constraint::Percentage(60), + Constraint::Percentage(20), ] .as_ref(), ) @@ -210,9 +212,9 @@ impl Painter { .margin(1) .constraints( [ - Constraint::Percentage(40), - Constraint::Percentage(20), - Constraint::Percentage(40), + Constraint::Percentage(35), + Constraint::Percentage(30), + Constraint::Percentage(35), ] .as_ref(), ) @@ -223,9 +225,9 @@ impl Painter { .margin(0) .constraints( [ - Constraint::Percentage(30), - Constraint::Percentage(40), - Constraint::Percentage(30), + Constraint::Percentage(25), + Constraint::Percentage(50), + Constraint::Percentage(25), ] .as_ref(), ) @@ -260,7 +262,7 @@ impl Painter { .render(&mut f, middle_dialog_chunk[1]); } else if let Some(to_kill_processes) = app_state.get_to_delete_processes() { if let Some(first_pid) = to_kill_processes.1.first() { - let dd_text = [ + let dd_text = vec![ if app_state.is_grouped() { if to_kill_processes.1.len() != 1 { Text::raw(format!( diff --git a/src/constants.rs b/src/constants.rs index 09f16fe2..72cea6f1 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -15,7 +15,7 @@ pub const DEFAULT_WINDOWS_CONFIG_FILE_PATH: &str = ""; pub const GENERAL_HELP_TEXT: [&str; 15] = [ "General Keybindings\n\n", "q, Ctrl-c Quit bottom\n", - "Esc Close filters, dialog boxes, etc.", + "Esc Close filters, dialog boxes, etc.\n", "Ctrl-r Reset all data\n", "f Freeze display\n", "Ctrl-Arrow Move currently selected widget\n", diff --git a/src/main.rs b/src/main.rs index 11388de1..da2f8292 100644 --- a/src/main.rs +++ b/src/main.rs @@ -230,9 +230,9 @@ fn main() -> error::Result<()> { } Event::MouseInput(event) => handle_mouse_event(event, &mut app), Event::Update(data) => { - if !app.is_frozen { - app.data_collection.eat_data(&data); + app.data_collection.eat_data(&data); + if !app.is_frozen { // Convert all data into tui-compliant components // Network |