griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

VSE: Fix strip icon drawing

Browse Source 
VSE icon drawing is larger than previous after #123700, and has an
incorrect check if there is enough space to show them. This PR restores
uses of MISSING_ICON_SIZE and fixes the minimum size check.

Pull Request: https://projects.blender.org/blender/blender/pulls/124378
This commit is contained in:
John Kiril Swenson
2024-07-11 19:18:13 +02:00
committed by Harley Acheson
parent 942cefdf91
commit 901f5495cb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_sequencer/sequencer_timeline_draw.cc
View File

@@ -876,8 +876,10 @@ static void draw_icon_centered(TimelineDrawContext &ctx,
UI_view2d_view_ortho(ctx.v2d);
wmOrtho2_region_pixelspace(ctx.region);
const float icon_size = 16 * UI_SCALE_FAC;
if (BLI_rctf_size_x(&ctx.v2d->cur) < icon_size) {
const float icon_size = MISSING_ICON_SIZE * UI_SCALE_FAC;
if (BLI_rctf_size_x(&rect) * 1.1f < icon_size * ctx.pixelx ||
BLI_rctf_size_y(&rect) * 1.1f < icon_size * ctx.pixely)
{
UI_view2d_view_restore(ctx.C);
return;
}
@@ -889,10 +891,12 @@ static void draw_icon_centered(TimelineDrawContext &ctx,
const float x_offset = (right - left - icon_size) * 0.5f;
const float y_offset = (top - bottom - icon_size) * 0.5f;
const float inv_scale_fac = (ICON_DEFAULT_HEIGHT / MISSING_ICON_SIZE) * UI_INV_SCALE_FAC;
UI_icon_draw_ex(left + x_offset,
bottom + y_offset,
icon_id,
UI_INV_SCALE_FAC,
inv_scale_fac,
1.0f,
0.0f,
color,