blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Remove File Browser "small_size" Feature #112696

Merged
Harley Acheson merged 1 commits from Harley/blender:RemoveSmallSize into main 2023-09-22 17:47:51 +02:00
Conversation 1 Commits 1 Files Changed 3 +10 -21
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/space_file/file_draw.cc
View File

@ -806,19 +806,17 @@ static void draw_columnheader_columns(const FileSelectParams *params,
static const char *filelist_get_details_column_string(
FileAttributeColumnType column,
/* Generated string will be cached in the file, so non-const. */
FileDirEntry *file,
const bool small_size,
const bool update_stat_strings)
FileDirEntry *file)
{
switch (column) {
case COLUMN_DATETIME:
if (!(file->typeflag & FILE_TYPE_BLENDERLIB) && !FILENAME_IS_CURRPAR(file->relpath)) {
if ((file->draw_data.datetime_str[0] == '\0') || update_stat_strings) {
if (file->draw_data.datetime_str[0] == '\0') {
char date[FILELIST_DIRENTRY_DATE_LEN], time[FILELIST_DIRENTRY_TIME_LEN];
bool is_today, is_yesterday;
BLI_filelist_entry_datetime_to_string(
nullptr, file->time, small_size, time, date, &is_today, &is_yesterday);
nullptr, file->time, false, time, date, &is_today, &is_yesterday);
if (is_today || is_yesterday) {
STRNCPY(date, is_today ? N_("Today") : N_("Yesterday"));
@ -833,9 +831,8 @@ static const char *filelist_get_details_column_string(
if ((file->typeflag & (FILE_TYPE_BLENDER | FILE_TYPE_BLENDER_BACKUP)) ||
!(file->typeflag & (FILE_TYPE_DIR | FILE_TYPE_BLENDERLIB)))
{
if ((file->draw_data.size_str[0] == '\0') || update_stat_strings) {
BLI_filelist_entry_size_to_string(
nullptr, file->size, small_size, file->draw_data.size_str);
if (file->draw_data.size_str[0] == '\0') {
BLI_filelist_entry_size_to_string(nullptr, file->size, false, file->draw_data.size_str);
}
return file->draw_data.size_str;
@ -854,8 +851,6 @@ static void draw_details_columns(const FileSelectParams *params,
const rcti *tile_draw_rect,
const uchar text_col[4])
{
const bool small_size = SMALL_SIZE_CHECK(params->thumbnail_size);
const bool update_stat_strings = small_size != SMALL_SIZE_CHECK(layout->curr_size);
int sx = tile_draw_rect->xmin - layout->tile_border_x - (UI_UNIT_X * 0.1f);
for (int column_type = 0; column_type < ATTRIBUTE_COLUMN_MAX; column_type++) {
@ -870,8 +865,8 @@ static void draw_details_columns(const FileSelectParams *params,
continue;
}
const char *str = filelist_get_details_column_string(
FileAttributeColumnType(column_type), file, small_size, update_stat_strings);
const char *str = filelist_get_details_column_string(FileAttributeColumnType(column_type),
file);
if (str) {
file_draw_string(sx + ATTRIBUTE_COLUMN_PADDING,

3
source/blender/editors/space_file/file_intern.hh
View File

@ -36,9 +36,6 @@ int /*eContextResult*/ file_context(const bContext *C,
#define ATTRIBUTE_COLUMN_PADDING (0.5f * UI_UNIT_X)
/** Related to #FileSelectParams.thumbnail_size. */
#define SMALL_SIZE_CHECK(_size) ((_size) < 64)
void file_calc_previews(const bContext *C, ARegion *region);
void file_draw_list(const bContext *C, ARegion *region);
/**

9
source/blender/editors/space_file/filesel.cc
View File

@ -974,18 +974,15 @@ float file_font_pointsize()
static void file_attribute_columns_widths(const FileSelectParams *params, FileLayout *layout)
{
FileAttributeColumn *columns = layout->attribute_columns;
const bool small_size = SMALL_SIZE_CHECK(params->thumbnail_size);
const int pad = small_size ? 0 : ATTRIBUTE_COLUMN_PADDING * 2;
const int pad = ATTRIBUTE_COLUMN_PADDING * 2;
for (int i = 0; i < ATTRIBUTE_COLUMN_MAX; i++) {
layout->attribute_columns[i].width = 0;
}
/* Biggest possible reasonable values... */
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 MiB") + pad;
columns[COLUMN_DATETIME].width = file_string_width("23 Dec 6789, 23:59") + pad;
columns[COLUMN_SIZE].width = file_string_width("098.7 MiB") + pad;
if (params->display == FILE_IMGDISPLAY) {
columns[COLUMN_NAME].width = (float(params->thumbnail_size) / 8.0f) * UI_UNIT_X;
}