CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-06-01 18:19:56 +12:00
Code Issues Projects Releases Wiki Activity

Add fmt prefix for fmtlib

Browse source
This commit is contained in:
aristocratos 2023-05-21 11:58:52 +02:00
parent 09c075e06c d64f9939e6
commit bd688e24bf
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/btop.cpp
View file

@ -196,7 +196,7 @@ void term_resize(bool force) {
sleep_ms(100);
if (Term::width < minWidth or Term::height < minHeight) {
int width = Term::width, height = Term::height;
cout << format("{clear}{bg_black}{fg_white}"
cout << fmt::format("{clear}{bg_black}{fg_white}"
"{mv1}Terminal size too small:"
"{mv2} Width = {fg_width}{width} {fg_white}Height = {fg_height}{height}"
"{mv3}{fg_white}Needed for current config:"
@ -603,7 +603,7 @@ namespace Runner {
if (empty_bg.empty()) {
const int x = Term::width / 2 - 10, y = Term::height / 2 - 10;
output += Term::clear;
empty_bg = format(
empty_bg = fmt::format(
"{banner}"
"{mv1}{titleFg}{b}No boxes shown!"
"{mv2}{hiFg}1 {mainFg}| Show CPU box"
@ -628,7 +628,7 @@ namespace Runner {
//! DEBUG stats -->
if (Global::debug and not Menu::active) {
output += format("{pre}{box:5.5} {collect:>12.12} {draw:>12.12}{post}",
output += fmt::format("{pre}{box:5.5} {collect:>12.12} {draw:>12.12}{post}",
"pre"_a = debug_bg + Theme::c("title") + Fx::b,
"box"_a = "box", "collect"_a = "collect", "draw"_a = "draw",
"post"_a = Theme::c("main_fg") + Fx::ub
@ -638,7 +638,7 @@ namespace Runner {
if (not debug_times.contains(name)) debug_times[name] = {0,0};
const auto& [time_collect, time_draw] = debug_times.at(name);
if (name == "total") output += Fx::b;
output += format(loc, "{mvLD}{name:5.5} {collect:12L} {draw:12L}",
output += fmt::format(loc, "{mvLD}{name:5.5} {collect:12L} {draw:12L}",
"mvLD"_a = Mv::l(31) + Mv::d(1),
"name"_a = name,
"collect"_a = time_collect,

1
src/btop_tools.hpp
View file

@ -50,7 +50,6 @@ using std::string;
using std::to_string;
using std::tuple;
using std::vector;
using namespace fmt;
using namespace fmt::literals;
//? ------------------------------------------------- NAMESPACES ------------------------------------------------------