From 04150230f27f1c5c00dfe489bf1d9b8ab8e85a4c Mon Sep 17 00:00:00 2001 From: corvid Date: Tue, 25 Dec 2012 18:24:12 +0000 Subject: use MB for progress of large pages --- src/ui.cc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ui.cc b/src/ui.cc index b17b5b1b..894e30eb 100644 --- a/src/ui.cc +++ b/src/ui.cc @@ -482,7 +482,7 @@ void UI::make_progress_bars(int wide, int thin_up) PProg->labelsize(12); PProg->box(thin_up ? FL_THIN_UP_BOX : FL_EMBOSSED_BOX); PProg->labelcolor(FL_GRAY_RAMP + 2); - PProg->update_label(wide ? "Page\n0.0KB" : "0.0KB"); + PProg->update_label(wide ? "Page\n0.0 KB" : "0.0 KB"); } /* @@ -850,8 +850,18 @@ void UI::set_page_prog(size_t nbytes, int cmd) } else { PProg->activate(); if (cmd == 1) { - snprintf(str, 32, "%s%.1f KB", - (PanelSize == 0) ? "" : "Page\n", nbytes/1024.0); + char prefix; + float magnitude; + + if (nbytes >= 1024 * 1024) { + prefix = 'M'; + magnitude = nbytes / (1024 * 1024.0); + } else { + prefix = 'K'; + magnitude = nbytes / 1024.0; + } + snprintf(str, 32, "%s%.1f %cB", + (PanelSize == 0) ? "" : "Page\n", magnitude, prefix); } else if (cmd == 2) { str[0] = '\0'; } -- cgit v1.2.3