From 2719d6d502bf64a5d4c8f60256312981630f0487 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 2 Mar 2020 20:59:47 +0100 Subject: [PATCH] SystemMonitor: Unbreak the in-table progress bars showing disk usage --- Applications/SystemMonitor/main.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp index 8c00fba9de..6711ddd240 100644 --- a/Applications/SystemMonitor/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -293,6 +293,15 @@ NonnullRefPtr build_file_systems_tab() }, [](const JsonObject& object) { return object.get("total_block_count").to_u32() * object.get("block_size").to_u32(); + }, + [](const JsonObject& object) { + auto total_blocks = object.get("total_block_count").to_u32(); + if (total_blocks == 0) + return 0; + auto free_blocks = object.get("free_block_count").to_u32(); + auto used_blocks = total_blocks - free_blocks; + int percentage = (int)((float)used_blocks / (float)total_blocks * 100.0f); + return percentage; }); df_fields.empend( "Used", Gfx::TextAlignment::CenterRight, @@ -306,15 +315,6 @@ NonnullRefPtr build_file_systems_tab() auto free_blocks = object.get("free_block_count").to_u32(); auto used_blocks = total_blocks - free_blocks; return used_blocks * object.get("block_size").to_u32(); - }, - [](const JsonObject& object) { - auto total_blocks = object.get("total_block_count").to_u32(); - if (total_blocks == 0) - return 0; - auto free_blocks = object.get("free_block_count").to_u32(); - auto used_blocks = total_blocks - free_blocks; - int percentage = (int)((float)used_blocks / (float)total_blocks * 100.0f); - return percentage; }); df_fields.empend( "Available", Gfx::TextAlignment::CenterRight,