From 82b13babb409d70f64ddae164391773228b8da0c Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Wed, 20 Mar 2024 08:23:24 -0700 Subject: [PATCH] Force update to blender-v4.1-release. Otherwise conflicts rebasing. --- source/blender/editors/space_file/file_intern.hh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/space_file/file_intern.hh b/source/blender/editors/space_file/file_intern.hh index 381cc34eb8d..2f1d48e974f 100644 --- a/source/blender/editors/space_file/file_intern.hh +++ b/source/blender/editors/space_file/file_intern.hh @@ -35,9 +35,12 @@ int /*eContextResult*/ file_context(const bContext *C, #define ATTRIBUTE_COLUMN_PADDING (0.5f * UI_UNIT_X) -#define FILE_LAYOUT_COMPACT(_layout) ((_layout->width / UI_SCALE_FAC) < 500) -#define FILE_LAYOUT_HIDE_DATE(_layout) ((_layout->width / UI_SCALE_FAC) < 250) -#define FILE_LAYOUT_HIDE_SIZE(_layout) ((_layout->width / UI_SCALE_FAC) < 350) +#define FILE_LAYOUT_COMPACT(_layout) \ + (_layout->flag & FILE_LAYOUT_VER && (_layout->width / UI_SCALE_FAC) < 500) +#define FILE_LAYOUT_HIDE_DATE(_layout) \ + (_layout->flag & FILE_LAYOUT_VER && (_layout->width / UI_SCALE_FAC) < 250) +#define FILE_LAYOUT_HIDE_SIZE(_layout) \ + (_layout->flag & FILE_LAYOUT_VER && (_layout->width / UI_SCALE_FAC) < 350) void file_calc_previews(const bContext *C, ARegion *region); void file_draw_list(const bContext *C, ARegion *region); -- 2.30.2