diff options
| author | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-03-10 01:26:30 -0400 |
|---|---|---|
| committer | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-03-10 01:26:30 -0400 |
| commit | 104604313882d2e5a36307a9d96a09a4a55e1df2 (patch) | |
| tree | a45006c8074340b878b10aac62d5e99367432ca9 /src/canvas | |
| parent | e5588f16063ccb430104ff931719bb9aca27a359 (diff) | |
Fix bug with autohide causing hide to break.
Diffstat (limited to 'src/canvas')
| -rw-r--r-- | src/canvas/widgets/cpu_graph.rs | 4 | ||||
| -rw-r--r-- | src/canvas/widgets/mem_graph.rs | 3 | ||||
| -rw-r--r-- | src/canvas/widgets/network_graph.rs | 3 |
3 files changed, 7 insertions, 3 deletions
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 { |