From 6d4b311888d01f32381d8838a440981134613d40 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Mon, 9 Sep 2019 08:29:21 -0700 Subject: UI: File Browser Sizes in Binary for Windows This adds per-platform change so Windows users will see file sizes calculated with a base of 1024. Differential Revision: https://developer.blender.org/D5714 Reviewed by Brecht Van Lommel --- source/blender/blenlib/intern/BLI_filelist.c | 4 ++++ source/blender/editors/space_file/filesel.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender') diff --git a/source/blender/blenlib/intern/BLI_filelist.c b/source/blender/blenlib/intern/BLI_filelist.c index 3c53d1eee1b..a3b745fd63e 100644 --- a/source/blender/blenlib/intern/BLI_filelist.c +++ b/source/blender/blenlib/intern/BLI_filelist.c @@ -271,7 +271,11 @@ void BLI_filelist_entry_size_to_string(const struct stat *st, * everyone starts using __USE_FILE_OFFSET64 or equivalent. */ double size = (double)(st ? st->st_size : sz); +#ifdef WIN32 + BLI_str_format_byte_unit(r_size, size, false); +#else BLI_str_format_byte_unit(r_size, size, true); +#endif } /** diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index be8ebc18c2c..e54f13e9356 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -639,7 +639,7 @@ static void file_attribute_columns_widths(const FileSelectParams *params, FileLa columns[COLUMN_DATETIME].width = file_string_width(small_size ? "23/08/89" : "23 Dec 6789, 23:59") + pad; - columns[COLUMN_SIZE].width = file_string_width(small_size ? "98.7 M" : "098.7 MB") + pad; + columns[COLUMN_SIZE].width = file_string_width(small_size ? "98.7 M" : "098.7 MiB") + pad; if (params->display == FILE_IMGDISPLAY) { columns[COLUMN_NAME].width = ((float)params->thumbnail_size / 8.0f) * UI_UNIT_X; } -- cgit v1.2.3