diff options
| author | Jakob P. Liljenberg <admin@qvantnet.com> | 2023-12-12 21:47:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-12 21:47:01 +0100 |
| commit | b6a86962e23422b6f09ea40347cd4a7a49ae6647 (patch) | |
| tree | 8de419faa97c457c34cdc00b28ca259ec1902f90 | |
| parent | 809643373648c510788706404d5ec00ba714baba (diff) | |
| parent | 14e664e7564f595d911e462414357caade91eede (diff) | |
Merge branch 'main' into cpu-model
| -rw-r--r-- | src/btop_draw.cpp | 6 | ||||
| -rw-r--r-- | src/btop_shared.hpp | 2 | ||||
| -rw-r--r-- | src/osx/btop_collect.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/btop_draw.cpp b/src/btop_draw.cpp index edb1eec..5ae357e 100644 --- a/src/btop_draw.cpp +++ b/src/btop_draw.cpp @@ -2063,7 +2063,11 @@ namespace Draw { box = createBox(x, y, width, height, Theme::c("cpu_box"), true, (cpu_bottom ? "" : "cpu"), (cpu_bottom ? "cpu" : ""), 1); auto& custom = Config::getS("custom_cpu_name"); - const string cpu_title = uresize((custom.empty() ? Cpu::cpuName : custom) , b_width - 14); + static const bool hasCpuHz = not Cpu::get_cpuHz().empty(); + const string cpu_title = uresize( + (custom.empty() ? Cpu::cpuName : custom), + b_width - (Config::getB("show_cpu_freq") and hasCpuHz ? 14 : 4) + ); box += createBox(b_x, b_y, b_width, b_height, "", false, cpu_title); } diff --git a/src/btop_shared.hpp b/src/btop_shared.hpp index 383e189..017c7f8 100644 --- a/src/btop_shared.hpp +++ b/src/btop_shared.hpp @@ -210,6 +210,8 @@ namespace Cpu { auto get_core_mapping() -> unordered_flat_map<int, int>; extern unordered_flat_map<int, int> core_mapping; + auto get_cpuHz() -> string; + //* Get battery info from /sys auto get_battery() -> tuple<int, long, string>; } diff --git a/src/osx/btop_collect.cpp b/src/osx/btop_collect.cpp index 0a1f338..e410c74 100644 --- a/src/osx/btop_collect.cpp +++ b/src/osx/btop_collect.cpp @@ -236,7 +236,7 @@ namespace Cpu { name += n + ' '; } name.pop_back(); - for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Core"}) { + for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Apple", "Core"}) { name = s_replace(name, replace, ""); name = s_replace(name, " ", " "); } |