diff options
author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-05-09 16:23:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-09 16:23:15 -0400 |
commit | 90272777f7451c7e16e7d71f44f7c00133626177 (patch) | |
tree | 2d666a41fc852aad79f5ee6b1765fd433e1f86c6 /src/canvas | |
parent | 2e4d6a34aaf14ac18718f89397f70ab446c88c8d (diff) |
change: hide table gap if widget height is small
Diffstat (limited to 'src/canvas')
-rw-r--r-- | src/canvas/widgets/cpu_graph.rs | 2 | ||||
-rw-r--r-- | src/canvas/widgets/disk_table.rs | 8 | ||||
-rw-r--r-- | src/canvas/widgets/mem_graph.rs | 2 | ||||
-rw-r--r-- | src/canvas/widgets/network_graph.rs | 2 | ||||
-rw-r--r-- | src/canvas/widgets/process_table.rs | 7 | ||||
-rw-r--r-- | src/canvas/widgets/temp_table.rs | 8 |
6 files changed, 21 insertions, 8 deletions
diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs index e03e7d19..28d6dc21 100644 --- a/src/canvas/widgets/cpu_graph.rs +++ b/src/canvas/widgets/cpu_graph.rs @@ -123,7 +123,7 @@ impl CpuGraphWidget for Painter { cpu_widget_state.autohide_timer = None; Axis::default().bounds([-(cpu_widget_state.current_display_time as f64), 0.0]) } - } else if draw_loc.height < 7 { + } else if draw_loc.height < TIME_LABEL_HEIGHT_LIMIT { Axis::default().bounds([-(cpu_widget_state.current_display_time as f64), 0.0]) } else { Axis::default() diff --git a/src/canvas/widgets/disk_table.rs b/src/canvas/widgets/disk_table.rs index a9cabf9b..9749123a 100644 --- a/src/canvas/widgets/disk_table.rs +++ b/src/canvas/widgets/disk_table.rs @@ -51,9 +51,13 @@ impl DiskTableWidget for Painter { disk_table_state.select(Some( (disk_widget_state.scroll_state.current_scroll_position - start_position) as usize, )); - let sliced_vec = &mut disk_data[start_position as usize..]; let disk_rows = sliced_vec.iter().map(|disk| Row::Data(disk.iter())); + let table_gap = if draw_loc.height < TABLE_GAP_HEIGHT_LIMIT { + 0 + } else { + app_state.app_config_fields.table_gap + }; // Calculate widths // TODO: [PRETTY] Ellipsis on strings? @@ -123,7 +127,7 @@ impl DiskTableWidget for Painter { .map(|calculated_width| Constraint::Length(*calculated_width as u16)) .collect::<Vec<_>>()), ) - .header_gap(app_state.app_config_fields.table_gap), + .header_gap(table_gap), margined_draw_loc[0], disk_table_state, ); diff --git a/src/canvas/widgets/mem_graph.rs b/src/canvas/widgets/mem_graph.rs index 96cd3030..d25553ce 100644 --- a/src/canvas/widgets/mem_graph.rs +++ b/src/canvas/widgets/mem_graph.rs @@ -44,7 +44,7 @@ impl MemGraphWidget for Painter { mem_widget_state.autohide_timer = None; Axis::default().bounds([-(mem_widget_state.current_display_time as f64), 0.0]) } - } else if draw_loc.height < 7 { + } else if draw_loc.height < TIME_LABEL_HEIGHT_LIMIT { Axis::default().bounds([-(mem_widget_state.current_display_time as f64), 0.0]) } else { Axis::default() diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs index 583451d9..11aa9f85 100644 --- a/src/canvas/widgets/network_graph.rs +++ b/src/canvas/widgets/network_graph.rs @@ -94,7 +94,7 @@ impl NetworkGraphWidget for Painter { Axis::default() .bounds([-(network_widget_state.current_display_time as f64), 0.0]) } - } else if draw_loc.height < 7 { + } else if draw_loc.height < TIME_LABEL_HEIGHT_LIMIT { Axis::default().bounds([-(network_widget_state.current_display_time as f64), 0.0]) } else { Axis::default() diff --git a/src/canvas/widgets/process_table.rs b/src/canvas/widgets/process_table.rs index 0be27f71..d8f2764c 100644 --- a/src/canvas/widgets/process_table.rs +++ b/src/canvas/widgets/process_table.rs @@ -104,6 +104,11 @@ impl ProcessTableWidget for Painter { (proc_widget_state.scroll_state.current_scroll_position - start_position) as usize, )); + let table_gap = if draw_loc.height < TABLE_GAP_HEIGHT_LIMIT { + 0 + } else { + app_state.app_config_fields.table_gap + }; // Draw! let is_proc_widget_grouped = proc_widget_state.is_grouped; @@ -253,7 +258,7 @@ impl ProcessTableWidget for Painter { }) .collect::<Vec<_>>()), ) - .header_gap(app_state.app_config_fields.table_gap), + .header_gap(table_gap), margined_draw_loc[0], proc_table_state, ); diff --git a/src/canvas/widgets/temp_table.rs b/src/canvas/widgets/temp_table.rs index 69085fca..a6953f4d 100644 --- a/src/canvas/widgets/temp_table.rs +++ b/src/canvas/widgets/temp_table.rs @@ -52,9 +52,13 @@ impl TempTableWidget for Painter { temp_table_state.select(Some( (temp_widget_state.scroll_state.current_scroll_position - start_position) as usize, )); - let sliced_vec = &temp_sensor_data[start_position as usize..]; let temperature_rows = sliced_vec.iter().map(|temp_row| Row::Data(temp_row.iter())); + let table_gap = if draw_loc.height < TABLE_GAP_HEIGHT_LIMIT { + 0 + } else { + app_state.app_config_fields.table_gap + }; // Calculate widths let width = f64::from(draw_loc.width); @@ -123,7 +127,7 @@ impl TempTableWidget for Painter { .map(|calculated_width| Constraint::Length(*calculated_width as u16)) .collect::<Vec<_>>()), ) - .header_gap(app_state.app_config_fields.table_gap), + .header_gap(table_gap), margined_draw_loc[0], temp_table_state, ); |