CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-16 02:13:46 +12:00
Code Issues Projects Releases Wiki Activity

Merged changes from main

Browse source
This commit is contained in:
aristocratos 2023-05-20 17:15:45 +02:00
parent 8c710a2b68
commit 04ed16a9f6
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/btop.cpp
View file

@ -496,7 +496,7 @@ namespace Runner {
//! DEBUG stats
if (Global::debug) {
if (debug_bg.empty() or redraw)
Runner::debug_bg = Draw::createBox(2, 2, 33, 8, "", true, "μs");
Runner::debug_bg = Draw::createBox(2, 2, 33, 9, "", true, "μs");
debug_times.clear();
debug_times["total"] = {0, 0};
@ -660,7 +660,7 @@ namespace Runner {
"{mv3}{hiFg}2 {mainFg}| Show MEM box"
"{mv4}{hiFg}3 {mainFg}| Show NET box"
"{mv5}{hiFg}4 {mainFg}| Show PROC box"
"{mv6}{hiFg}5 {mainFg}| Show GPU box"
"{mv6}{hiFg}5-0 {mainFg}| Show GPU boxes"
"{mv7}{hiFg}esc {mainFg}| Show menu"
"{mv8}{hiFg}q {mainFg}| Quit",
"banner"_a = Draw::banner_gen(y, 0, true),
@ -670,7 +670,7 @@ namespace Runner {
"mv3"_a = Mv::to(y+9, x),
"mv4"_a = Mv::to(y+10, x),
"mv5"_a = Mv::to(y+11, x),
"mv6"_a = Mv::to(y+12, x),
"mv6"_a = Mv::to(y+12, x-2),
"mv7"_a = Mv::to(y+13, x-2),
"mv8"_a = Mv::to(y+14, x)
);
@ -685,7 +685,10 @@ namespace Runner {
"box"_a = "box", "collect"_a = "collect", "draw"_a = "draw",
"post"_a = Theme::c("main_fg") + Fx::ub
);
<<<<<<< HEAD
static auto loc = std::locale(std::locale::classic(), new MyNumPunct);
=======
>>>>>>> 48c3392 (Merged changes from main)
for (const string name : {"cpu", "mem", "net", "proc", "gpu", "total"}) {
if (not debug_times.contains(name)) debug_times[name] = {0,0};
const auto& [time_collect, time_draw] = debug_times.at(name);