mirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2026-05-19 14:10:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1603 from PatWie/main

Browse Source
This commit is contained in:
Jakob P. Liljenberg
2026-05-01 12:04:55 +02:00
committed by GitHub
parent c6f726d599 169737fb86
commit 4540816927
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/btop_draw.cpp
View File

@@ -625,7 +625,10 @@ namespace Cpu {
gpu_mem_graphs.resize(gpus.size());
gpu_meters.resize(gpus.size());
const int gpu_draw_count = gpu_always ? Gpu::count : Gpu::count - Gpu::shown;
graph_width = gpu_draw_count <= 0 ? graph_default_width : graph_default_width/gpu_draw_count - gpu_draw_count + 1 + graph_default_width%gpu_draw_count;
// Fairly distribute graph_default_width across gpu_draw_count GPUs, leaving 1 col per separator.
// Clamp to >=1 to avoid degenerate/negative widths reaching Draw::Graph::_create (#1118, #1017).
const int gpu_drawable_width = graph_default_width - max(0, gpu_draw_count - 1);
graph_width = gpu_draw_count <= 0 ? graph_default_width : max(1, gpu_drawable_width / gpu_draw_count);
for (size_t i = 0; i < gpus.size(); i++) {
if (gpu_auto and v_contains(Gpu::shown_panels, i))
continue;
@@ -638,7 +641,7 @@ namespace Cpu {
}
else {
graph = Draw::Graph{
graph_width + graph_default_width%graph_width - (int)gpus.size() + 1,
max(1, graph_width + (gpu_draw_count > 0 ? gpu_drawable_width % gpu_draw_count : 0)),
graph_height, "cpu", safeVal(gpu.gpu_percent, graph_field), graph_symbol, invert, true
};
}
@@ -793,8 +796,8 @@ namespace Cpu {
}
if (Gpu::count - (gpu_auto ? Gpu::shown : 0) > 1) {
auto i_str = to_string(i);
out += Mv::l(graph_width-1) + Mv::u(graph_height/2) + (graph_width > 5 ? "GPU" : "") + i_str
+ Mv::d(graph_height/2) + Mv::r(graph_width - 1 - (graph_width > 5)*3 - i_str.size());
out += Mv::l(max(0, graph_width-1)) + Mv::u(graph_height/2) + (graph_width > 5 ? "GPU" : "") + i_str
+ Mv::d(graph_height/2) + Mv::r(max(0, (int)(graph_width - 1 - (graph_width > 5)*3 - i_str.size())));
}
if (++gpu_drawn < Gpu::count - (gpu_auto ? Gpu::shown : 0))