blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

UI: Size Range of Preview Thumbnails #108557

Closed
Harley Acheson wants to merge 3 commits from Harley/blender:ThumbnailTiny into main
pull from: Harley/blender:ThumbnailTiny
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 3 Files Changed 4 +10 -6
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/userdef/userdef_default.c
View File

@ -214,7 +214,7 @@ const UserDef U_default = {
.file_space_data =
{
.display_type = FILE_VERTICALDISPLAY,
.thumbnail_size = 128,
.thumbnail_size = 96,
.sort_type = FILE_SORT_ALPHA,
.details_flags = FILE_DETAILS_SIZE | FILE_DETAILS_DATETIME,
.flag = FILE_HIDE_DOT,

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

@ -524,7 +524,9 @@ static void file_draw_preview(const FileList *files,
UI_NO_ICON_OVERLAY_TEXT);
}
}
else if (icon && ((!is_icon && !(file->typeflag & FILE_TYPE_FTFONT)) || is_loading)) {
else if (icon && layout->curr_size >= 64 &&
((!is_icon && !(file->typeflag & FILE_TYPE_FTFONT)) || is_loading))
{
/* Smaller, fainter icon at bottom-left for preview image thumbnail, but not for fonts. */
float icon_x, icon_y;
const uchar dark[4] = {0, 0, 0, 255};

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

@ -124,7 +124,7 @@ static void fileselect_ensure_updated_asset_params(SpaceFile *sfile)
base_params->sort = FILE_SORT_ALPHA;
/* Asset libraries include all sub-directories, so enable maximal recursion. */
base_params->recursion_level = FILE_SELECT_MAX_RECURSIONS;
/* 'SMALL' size by default. More reasonable since this is typically used as regular editor,
/* 'NORMAL' size by default. More reasonable since this is typically used as regular editor,
* space is more of an issue here. */
base_params->thumbnail_size = 96;

8
source/blender/makesrna/intern/rna_space.cc
View File

@ -6740,10 +6740,12 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
};
static const EnumPropertyItem display_size_items[] = {
{64, "TINY", 0, "Tiny", ""},
{96, "SMALL", 0, "Small", ""},
{128, "NORMAL", 0, "Medium", ""},
{32, "TINY", 0, "Tiny", ""},
{64, "SMALL", 0, "Small", ""},
{96, "NORMAL", 0, "Medium", ""},
{128, "BIG", 0, "Big", ""},
{192, "LARGE", 0, "Large", ""},
{256, "HUGE", 0, "Huge", ""},
{0, nullptr, 0, nullptr, nullptr},
};