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

Fix #123675: Use ICON_TYPE_MONO_TEXTURE Icons for Error Conditions

Browse Source 
VSE is drawing error icons on strips using icons of type
ICON_TYPE_COLOR_TEXTURE, using the regular icon texture, which is
no longer used for standard icons. This PR changes this to use regular
UI_icon_draw_ex() here instead.

Pull Request: https://projects.blender.org/blender/blender/pulls/123700
This commit is contained in:
Harley Acheson
2024-06-26 19:52:10 +02:00
committed by Harley Acheson
parent f6358f6e71
commit 992e47bc45
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -907,27 +907,39 @@ static void draw_icon_centered(TimelineDrawContext &ctx,
int icon_id,
const uchar color[4])
{
const float icon_size_x = MISSING_ICON_SIZE * ctx.pixelx * UI_SCALE_FAC;
const float icon_size_y = MISSING_ICON_SIZE * ctx.pixely * UI_SCALE_FAC;
if (BLI_rctf_size_x(&rect) * 1.1f < icon_size_x || BLI_rctf_size_y(&rect) * 1.1f < icon_size_y) {
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) {
UI_view2d_view_restore(ctx.C);
return;
}
UI_icon_draw_mono_rect(BLI_rctf_cent_x(&rect) - icon_size_x * 0.5f,
BLI_rctf_cent_y(&rect) - icon_size_y * 0.5f,
icon_size_x,
icon_size_y,
icon_id,
color);
const float left = ((rect.xmin - ctx.v2d->cur.xmin) / ctx.pixelx);
const float right = ((rect.xmax - ctx.v2d->cur.xmin) / ctx.pixelx);
const float bottom = ((rect.ymin - ctx.v2d->cur.ymin) / ctx.pixely);
const float top = ((rect.ymax - ctx.v2d->cur.ymin) / ctx.pixely);
const float x_offset = (right - left - icon_size) * 0.5f;
const float y_offset = (top - bottom - icon_size) * 0.5f;
UI_icon_draw_ex(left + x_offset,
bottom + y_offset,
icon_id,
UI_INV_SCALE_FAC,
1.0f,
0.0f,
color,
false,
UI_NO_ICON_OVERLAY_TEXT);
/* Restore view matrix. */
UI_view2d_view_restore(ctx.C);
}
static void draw_strip_icons(TimelineDrawContext *timeline_ctx,
const Vector<StripDrawContext> &strips)
{
GPU_blend(GPU_BLEND_ALPHA);
UI_icon_draw_cache_begin();
const float icon_size_x = MISSING_ICON_SIZE * timeline_ctx->pixelx * UI_SCALE_FAC;
for (const StripDrawContext &strip : strips) {
@@ -976,9 +988,6 @@ static void draw_strip_icons(TimelineDrawContext *timeline_ctx,
}
}
}
UI_icon_draw_cache_end();
GPU_blend(GPU_BLEND_NONE);
}
/* Draw info text on a sequence strip. */