summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormasiboss <32394683+masiboss@users.noreply.github.com>2023-12-07 20:49:34 +0100
committermasiboss <32394683+masiboss@users.noreply.github.com>2023-12-07 20:49:34 +0100
commit1b2f11b41234f7cdf83212c81cdbf086f491049d (patch)
tree024dcfef7a2615fce20a8146427e3143a6e62ca8
parentbcf4ad8ab6a8b69f17ad7936a36595f15dbc0953 (diff)
cut less of cpu name if frequency is not shown
-rw-r--r--src/btop_draw.cpp6
-rw-r--r--src/btop_shared.hpp2
2 files changed, 7 insertions, 1 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>;
}