Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PackageInstaller: use string_for_size instead of a custom function.

Browse Source
This commit is contained in:
Augustin Cavalier 2015-04-26 20:14:51 -04:00
parent e5ab3b0900
commit 0cec9e7680
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apps/packageinstaller/PackageView.cpp
View File

@ -27,6 +27,7 @@
#include <Path.h>
#include <PopUpMenu.h>
#include <ScrollView.h>
#include <StringForSize.h>
#include <TextView.h>
#include <Volume.h>
#include <VolumeRoster.h>
@ -47,24 +48,6 @@ const float kMaxDescHeight = 125.0f;
const uint32 kSeparatorIndex = 3;
static void
convert_size(uint64 size, char *buffer, uint32 n)
{
if (size < 1024)
snprintf(buffer, n, B_TRANSLATE("%llu bytes"), size);
else if (size < 1024 * 1024)
snprintf(buffer, n, B_TRANSLATE("%.1f KiB"), size / 1024.0f);
else if (size < 1024 * 1024 * 1024)
snprintf(buffer, n, B_TRANSLATE("%.1f MiB"),
size / (1024.0f * 1024.0f));
else {
snprintf(buffer, n, B_TRANSLATE("%.1f GiB"),
size / (1024.0f * 1024.0f * 1024.0f));
}
}
// #pragma mark -
@ -684,7 +667,7 @@ PackageView::_NamePlusSizeString(BString baseName, size_t size,
const char* format) const
{
char sizeString[48];
convert_size(size, sizeString, sizeof(sizeString));
string_for_size(size, sizeString, sizeof(sizeString));
BString name(format);
name.ReplaceAll("%name%", baseName);