Archives
/
MangoHud
mirror of https://github.com/flightlessmango/MangoHud
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix cpu usage formatting (float parsed as int)

Browse Source
pull/286/head^2
jackun 4 years ago
parent c75232389b
commit 6f176a3f3b
No known key found for this signature in database
GPG Key ID: 119DB3F1D05A9ED3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File

9
src/overlay.cpp
Unescape Escape View File

@ -811,7 +811,7 @@ void check_keybinds(struct swapchain_stats& sw_stats, struct overlay_params& par
last_upload_press = now; last_upload_press = now;
logger->upload_last_log(); logger->upload_last_log();
} }
} }
if (params.permit_upload && elapsedUpload >= keyPressDelay){ if (params.permit_upload && elapsedUpload >= keyPressDelay){
#ifdef HAVE_X11 #ifdef HAVE_X11
pressed = keys_are_pressed(params.upload_logs); pressed = keys_are_pressed(params.upload_logs);
@ -1124,12 +1124,11 @@ void render_benchmark(swapchain_stats& data, struct overlay_params& params, ImVe
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);
ImGui::End(); ImGui::End();
} }
void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& window_size, bool is_vulkan){ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& window_size, bool is_vulkan){
static int tableCols = 2; static int tableCols = 2;
static float ralign_width = 0, old_scale = 0; static float ralign_width = 0, old_scale = 0;
window_size = ImVec2(300, params.height); window_size = ImVec2(300, params.height);
unsigned height = ImGui::GetIO().DisplaySize.y;
auto now = Clock::now();
if (old_scale != params.font_scale) { if (old_scale != params.font_scale) {
ralign_width = ImGui::CalcTextSize("A").x * 4 /* characters */; ralign_width = ImGui::CalcTextSize("A").x * 4 /* characters */;
@ -1159,7 +1158,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2&
cpu_text = params.cpu_text.c_str(); cpu_text = params.cpu_text.c_str();
ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(params.cpu_color), "%s", cpu_text); ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(params.cpu_color), "%s", cpu_text);
ImGui::TableNextCell(); ImGui::TableNextCell();
right_aligned_text(ralign_width, "%d", cpuStats.GetCPUDataTotal().percent); right_aligned_text(ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent));
ImGui::SameLine(0, 1.0f); ImGui::SameLine(0, 1.0f);
ImGui::Text("%%"); ImGui::Text("%%");
} }
@ -1272,7 +1271,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
cpu_text = params.cpu_text.c_str(); cpu_text = params.cpu_text.c_str();
ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(params.cpu_color), "%s", cpu_text); ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(params.cpu_color), "%s", cpu_text);
ImGui::TableNextCell(); ImGui::TableNextCell();
right_aligned_text(ralign_width, "%d", cpuStats.GetCPUDataTotal().percent); right_aligned_text(ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent));
ImGui::SameLine(0, 1.0f); ImGui::SameLine(0, 1.0f);
ImGui::Text("%%"); ImGui::Text("%%");
// ImGui::SameLine(150); // ImGui::SameLine(150);

Write Preview
Loading…
Cancel
Save