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

Minor rearrangement of CPU toggle location.

Browse Source
This commit is contained in:
ClementTsang 2020-02-17 00:40:39 -05:00
parent 0de4b65e1a
commit cbafbfc699
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/canvas.rs
View File

@ -23,7 +23,7 @@ use drawing_utils::*;
// Headers // Headers
const CPU_LEGEND_HEADER: [&str; 2] = ["CPU", "Use%"]; const CPU_LEGEND_HEADER: [&str; 2] = ["CPU", "Use%"];
const CPU_SELECT_LEGEND_HEADER: [&str; 3] = ["CPU", "Use%", "Show"]; const CPU_SELECT_LEGEND_HEADER: [&str; 3] = ["Show (Space)", "CPU", "Use%"];
const DISK_HEADERS: [&str; 7] = ["Disk", "Mount", "Used", "Free", "Total", "R/s", "W/s"]; const DISK_HEADERS: [&str; 7] = ["Disk", "Mount", "Used", "Free", "Total", "R/s", "W/s"];
const TEMP_HEADERS: [&str; 2] = ["Sensor", "Temp"]; const TEMP_HEADERS: [&str; 2] = ["Sensor", "Temp"];
const MEM_HEADERS: [&str; 3] = ["Mem", "Usage", "Use%"]; const MEM_HEADERS: [&str; 3] = ["Mem", "Usage", "Use%"];
@ -622,20 +622,22 @@ impl Painter {
for (itx, cpu) in sliced_cpu_data.iter().enumerate() { for (itx, cpu) in sliced_cpu_data.iter().enumerate() {
if let Some(cpu_data) = cpu.cpu_data.last() { if let Some(cpu_data) = cpu.cpu_data.last() {
let mut entry = vec![ let entry = if app_state.cpu_state.is_showing_tray {
cpu.cpu_name.clone(), vec![
format!("{:.0}%", cpu_data.usage.round()),
];
if app_state.cpu_state.is_showing_tray {
entry.push(
if app_state.cpu_state.core_show_vec[itx + start_position as usize] { if app_state.cpu_state.core_show_vec[itx + start_position as usize] {
"[*]".to_string() "[*]".to_string()
} else { } else {
"[ ]".to_string() "[ ]".to_string()
}, },
) cpu.cpu_name.clone(),
} format!("{:.0}%", cpu_data.usage.round()),
]
} else {
vec![
cpu.cpu_name.clone(),
format!("{:.0}%", cpu_data.usage.round()),
]
};
stringified_cpu_data.push(entry); stringified_cpu_data.push(entry);
} }
@ -696,12 +698,12 @@ impl Painter {
let intrinsic_widths = &(variable_intrinsic_results.0)[0..variable_intrinsic_results.1]; let intrinsic_widths = &(variable_intrinsic_results.0)[0..variable_intrinsic_results.1];
let title = if app_state.cpu_state.is_showing_tray { let title = if app_state.cpu_state.is_showing_tray {
const TITLE_BASE: &str = " Esc to go close "; const TITLE_BASE: &str = " Esc to close";
let repeat_num = max( let repeat_num = max(
0, 0,
draw_loc.width as i32 - TITLE_BASE.chars().count() as i32 - 2, draw_loc.width as i32 - TITLE_BASE.chars().count() as i32 - 2,
); );
let result_title = format!("{} Esc to go close ", "─".repeat(repeat_num as usize)); let result_title = format!("{} Esc to close ", "─".repeat(repeat_num as usize));
result_title result_title
} else { } else {