Commit: 4e2be2f39e87f0379425915a5cfa77dc24c8f802
Author: Julian Eisel
Date: Fri Aug 23 15:38:57 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB4e2be2f39e87f0379425915a5cfa77dc24c8f802
Fix size column text missing when date column is disabled
===================================================================
M source/blender/editors/space_file/file_draw.c
===================================================================
diff --git a/source/blender/editors/space_file/file_draw.c
b/source/blender/editors/space_file/file_draw.c
index 30dc62aff63..91b9f872239 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -543,7 +543,8 @@ static const char
*filelist_get_details_column_string(FileListColumns column,
if (!(file->typeflag & FILE_TYPE_BLENDERLIB) &&
!FILENAME_IS_CURRPAR(file->relpath)) {
if ((file->entry->datetime_str[0] == '\0') || update_stat_strings) {
char date[16], time[8];
- BLI_filelist_entry_datetime_to_string(NULL, file->entry->time,
small_size, time, date, true);
+ BLI_filelist_entry_datetime_to_string(
+ NULL, file->entry->time, small_size, time, date, true);
BLI_snprintf(
file->entry->datetime_str, sizeof(file->entry->datetime_str),
"%s %s", date, time);
}
@@ -584,10 +585,14 @@ static void draw_details_columns(const FileSelectParams
*params,
const FileDetailsColumn *column = &layout->details_columns[column_type];
/* Name column is not a detail column (should already be drawn), always
skip here. */
- if ((column_type == COLUMN_NAME) || !file_column_type_enabled(params,
column_type)) {
+ if (column_type == COLUMN_NAME) {
sx += column->width;
continue;
}
+ if (!file_column_type_enabled(params, column_type)) {
+ continue;
+ }
+
const char *str = filelist_get_details_column_string(
column_type, file, small_size, update_stat_strings);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
