kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

UI: File Browser Sizes in Binary for Windows

Browse Source 
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
This commit is contained in:
Harley Acheson 2019-09-09 08:29:21 -07:00
parent 2b2739724e
commit 6d4b311888
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit c3348263dc26d6272db88ed94b73caa3ddb3a3fd
Subproject commit 14abe13dc890ba8fc7f78723ad67533ec2146aff

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 7cba50c84cd415cbdfc900ee2c4e7b3f59d5214c
Subproject commit c646ac7c00965d9a117e50a066b777f5691028b9

4
source/blender/blenlib/intern/BLI_filelist.c
View File

@ -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
}
/**

2
source/blender/editors/space_file/filesel.c
View File

@ -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;
}

2
source/tools

@ -1 +1 @@
Subproject commit 2550eda6bcefad45289acbb4b8e52107e742ce1f
Subproject commit 7b740545cd039ddcadbfb9bffcac842476eee271