From 104604313882d2e5a36307a9d96a09a4a55e1df2 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Tue, 10 Mar 2020 01:26:30 -0400 Subject: [PATCH] Fix bug with autohide causing hide to break. --- README.md | 4 +++- src/canvas/widgets/cpu_graph.rs | 4 +++- src/canvas/widgets/mem_graph.rs | 3 ++- src/canvas/widgets/network_graph.rs | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cbd15b90..4bdd90d0 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,9 @@ Features of bottom include: - Maximizing of widgets of interest to take up the entire window. -- Basic mode +- A minimal mode that focuses less on graphs and more on data, similar to [htop](https://hisham.hm/htop/). + +- Zooming in/out to see more/less data. More details about each widget and compatibility can be found [here](./docs/widgets.md). diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs index 462cbf44..c0cbb371 100644 --- a/src/canvas/widgets/cpu_graph.rs +++ b/src/canvas/widgets/cpu_graph.rs @@ -47,8 +47,10 @@ impl CpuGraphWidget for Painter { format!("{}s", app_state.cpu_state.display_time / 1000), "0s".to_string(), ]; + let x_axis = if app_state.app_config_fields.hide_time - || app_state.cpu_state.display_time_instant.is_none() + || (app_state.app_config_fields.autohide_time + && app_state.cpu_state.display_time_instant.is_none()) { Axis::default().bounds([0.0, app_state.cpu_state.display_time as f64]) } else if let Some(time) = app_state.cpu_state.display_time_instant { diff --git a/src/canvas/widgets/mem_graph.rs b/src/canvas/widgets/mem_graph.rs index 77062e14..d30e88e3 100644 --- a/src/canvas/widgets/mem_graph.rs +++ b/src/canvas/widgets/mem_graph.rs @@ -31,7 +31,8 @@ impl MemGraphWidget for Painter { "0s".to_string(), ]; let x_axis = if app_state.app_config_fields.hide_time - || app_state.mem_state.display_time_instant.is_none() + || (app_state.app_config_fields.autohide_time + && app_state.mem_state.display_time_instant.is_none()) { Axis::default().bounds([0.0, app_state.mem_state.display_time as f64]) } else if let Some(time) = app_state.mem_state.display_time_instant { diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs index d5ec1865..f8abff28 100644 --- a/src/canvas/widgets/network_graph.rs +++ b/src/canvas/widgets/network_graph.rs @@ -44,7 +44,8 @@ impl NetworkGraphWidget for Painter { "0s".to_string(), ]; let x_axis = if app_state.app_config_fields.hide_time - || app_state.net_state.display_time_instant.is_none() + || (app_state.app_config_fields.autohide_time + && app_state.net_state.display_time_instant.is_none()) { Axis::default().bounds([0.0, app_state.net_state.display_time as f64]) } else if let Some(time) = app_state.net_state.display_time_instant {