diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-13 14:03:55 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-13 14:03:55 +0300 |
commit | 498bd0772ec54601241911b6a98f4fedf97d9166 (patch) | |
tree | 0a85b6e6a78603245d61958a5add2482a9bcb4cc /source/blender/editors/space_file | |
parent | b55c78a289c600696282f97191d6e800a1c1ac34 (diff) | |
parent | cbcc15bdaf98cf76ec42fb09e898c95407905f32 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 6b594c02c15..3b62941af83 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -47,6 +47,7 @@ #include "BLI_blenlib.h" #include "BLI_fnmatch.h" +#include "BLI_math_base.h" #include "BLI_utildefines.h" #include "BLO_readfile.h" @@ -758,11 +759,11 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, ARegion *region) layout->attribute_column_header_h = 0; layout->offset_top = 0; if (layout->flow_columns > 0) { - layout->rows = numfiles / layout->flow_columns + 1; // XXX dirty, modulo is zero + layout->rows = divide_ceil_u(numfiles, layout->flow_columns); } else { layout->flow_columns = 1; - layout->rows = numfiles + 1; // XXX dirty, modulo is zero + layout->rows = numfiles; } layout->height = sfile->layout->rows * (layout->tile_h + 2 * layout->tile_border_y) + layout->tile_border_y * 2 - layout->offset_top; @@ -807,11 +808,11 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, ARegion *region) file_attribute_columns_init(params, layout); if (layout->rows > 0) { - layout->flow_columns = numfiles / layout->rows + 1; // XXX dirty, modulo is zero + layout->flow_columns = divide_ceil_u(numfiles, layout->rows); } else { layout->rows = 1; - layout->flow_columns = numfiles + 1; // XXX dirty, modulo is zero + layout->flow_columns = numfiles; } layout->width = sfile->layout->flow_columns * (layout->tile_w + 2 * layout->tile_border_x) + layout->tile_border_x * 2; |