tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-25 06:35:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with network legend on windows

Browse Source
This commit is contained in:
Clement Tsang 2020-01-02 18:34:09 -05:00
parent f6eb2d6e54
commit f018cb7542
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/canvas.rs
View File

@ -229,15 +229,7 @@ pub fn draw_data<B: backend::Backend>(terminal: &mut Terminal<B>, app_state: &mu
draw_memory_graph(&mut f, &app_state, middle_chunks[0]); draw_memory_graph(&mut f, &app_state, middle_chunks[0]);
// Network graph // Network graph
draw_network_graph( draw_network_graph(&mut f, &app_state, network_chunk[0]);
&mut f,
&app_state,
if cfg!(not(target_os = "windows")) {
network_chunk[0]
} else {
bottom_chunks[0]
},
);
draw_network_labels(&mut f, app_state, network_chunk[1]); draw_network_labels(&mut f, app_state, network_chunk[1]);
@ -471,26 +463,42 @@ fn draw_network_labels<B: backend::Backend>(f: &mut Frame<B>, app_state: &mut ap
let total_tx_display: String = app_state.canvas_data.total_tx_display.clone(); let total_tx_display: String = app_state.canvas_data.total_tx_display.clone();
// Gross but I need it to work... // Gross but I need it to work...
let total_network = vec![vec![rx_display, tx_display, total_rx_display, total_tx_display]]; let total_network = if cfg!(not(target_os = "windows")) {
vec![vec![rx_display, tx_display, total_rx_display, total_tx_display]]
} else {
vec![vec![rx_display, tx_display]]
};
let mapped_network = total_network.iter().map(|val| Row::Data(val.iter())); let mapped_network = total_network.iter().map(|val| Row::Data(val.iter()));
Table::new(["RX", "TX", "Total RX", "Total TX"].iter(), mapped_network) Table::new(
.block( if cfg!(not(target_os = "windows")) {
Block::default() vec!["RX", "TX", "Total RX", "Total TX"]
.borders(Borders::ALL) } else {
.border_style(match app_state.current_application_position { vec!["RX", "TX"]
app::ApplicationPosition::Network => *CANVAS_HIGHLIGHTED_BORDER_STYLE, }
_ => *CANVAS_BORDER_STYLE, .iter(),
}), mapped_network,
) )
.header_style(Style::default().fg(Color::LightBlue)) .block(
.widths(&[ Block::default()
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::Network => *CANVAS_HIGHLIGHTED_BORDER_STYLE,
_ => *CANVAS_BORDER_STYLE,
}),
)
.header_style(Style::default().fg(Color::LightBlue))
.widths(&if cfg!(not(target_os = "windows")) {
vec![
Constraint::Percentage(25), Constraint::Percentage(25),
Constraint::Percentage(25), Constraint::Percentage(25),
Constraint::Percentage(25), Constraint::Percentage(25),
Constraint::Percentage(25), Constraint::Percentage(25),
]) ]
.render(f, draw_loc); } else {
vec![Constraint::Percentage(50), Constraint::Percentage(50)]
})
.render(f, draw_loc);
} }
fn draw_temp_table<B: backend::Backend>(f: &mut Frame<B>, app_state: &mut app::App, draw_loc: Rect) { fn draw_temp_table<B: backend::Backend>(f: &mut Frame<B>, app_state: &mut app::App, draw_loc: Rect) {