From 8139e49189c2e14ed06e72b69c4f07a3e8850666 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Wed, 12 Jul 2023 16:30:52 -0700 Subject: [PATCH] UI: Show SVG Thumbnails with Checkerboard Backgrounds Show checkerboard background behind SVG thumbnails just as we do for other image types. --- source/blender/editors/space_file/file_draw.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/editors/space_file/file_draw.cc b/source/blender/editors/space_file/file_draw.cc index 326a96f4836..373d9657965 100644 --- a/source/blender/editors/space_file/file_draw.cc +++ b/source/blender/editors/space_file/file_draw.cc @@ -357,8 +357,8 @@ static void file_draw_preview(const FileList *files, float scaledx, scaledy; float scale; int ex, ey; - bool show_outline = !is_icon && - (file->typeflag & (FILE_TYPE_IMAGE | FILE_TYPE_MOVIE | FILE_TYPE_BLENDER)); + bool show_outline = !is_icon && (file->typeflag & (FILE_TYPE_IMAGE | FILE_TYPE_OBJECT_IO | + FILE_TYPE_MOVIE | FILE_TYPE_BLENDER)); const bool is_offline = (file->attributes & FILE_ATTR_OFFLINE); const bool is_loading = !filelist_is_ready(files) || file->flags & FILE_ENTRY_PREVIEW_LOADING; @@ -417,7 +417,7 @@ static void file_draw_preview(const FileList *files, document_img_col[3] *= 0.3f; } - if (!is_icon && file->typeflag & FILE_TYPE_IMAGE) { + if (!is_icon && ELEM(file->typeflag, FILE_TYPE_IMAGE, FILE_TYPE_OBJECT_IO)) { /* Draw checker pattern behind image previews in case they have transparency. */ imm_draw_box_checker_2d(float(xco), float(yco), float(xco + ex), float(yco + ey)); } @@ -574,7 +574,7 @@ static void file_draw_preview(const FileList *files, GPUVertFormat *format = immVertexFormat(); uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); - float border_color[4] = {1.0f, 1.0f, 1.0f, 0.4f}; + float border_color[4] = {1.0f, 1.0f, 1.0f, 0.15f}; float bgcolor[4]; UI_GetThemeColor4fv(TH_BACK, bgcolor); if (rgb_to_grayscale(bgcolor) > 0.5f) { @@ -583,7 +583,7 @@ static void file_draw_preview(const FileList *files, border_color[2] = 0.0f; } immUniformColor4fv(border_color); - imm_draw_box_wire_2d(pos, float(xco), float(yco), float(xco + ex), float(yco + ey)); + imm_draw_box_wire_2d(pos, float(xco), float(yco), float(xco + ex + 1), float(yco + ey + 1)); immUnbindProgram(); } -- 2.30.2