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

Fix #134270: Connected icon hidden when text overlays are disabled

Browse Source 
Connected strip status is critical information, maybe more important
than strip name. Therefore it should be drawn unless all overlays are
disabled.

This commit makes the icon visible in strip "header" area even if text
overlays are disabled. Content is maximized in this case, and the icon
is drawn over the content.

![Screenshot_2025-02-12_04-50-14.png](/attachments/c2ad510b-388b-4e2f-b23c-3b494d559f38)

Pull Request: https://projects.blender.org/blender/blender/pulls/134432
This commit is contained in:
Richard Antalik
2025-02-13 03:15:49 +01:00
committed by Richard Antalik
parent 4c67c78452
commit db2108dd89
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,6 +200,11 @@ static void strip_draw_context_set_retiming_overlay_visibility(TimelineDrawConte
strip_ctx->can_draw_retiming_overlay &= retiming_keys_can_be_displayed(ctx->sseq);
}
static float strip_header_size_get(TimelineDrawContext *ctx)
{
return min_ff(0.40f, 20 * UI_SCALE_FAC * ctx->pixely);
}
static StripDrawContext strip_draw_context_get(TimelineDrawContext *ctx, Strip *strip)
{
using namespace seq;
@@ -255,7 +260,7 @@ static StripDrawContext strip_draw_context_get(TimelineDrawContext *ctx, Strip *
}
if (strip_ctx.can_draw_text_overlay) {
strip_ctx.strip_content_top = strip_ctx.top - min_ff(0.40f, 20 * UI_SCALE_FAC * ctx->pixely);
strip_ctx.strip_content_top = strip_ctx.top - strip_header_size_get(ctx);
}
else {
strip_ctx.strip_content_top = strip_ctx.top;
@@ -964,15 +969,13 @@ static void draw_strip_icons(TimelineDrawContext *timeline_ctx,
}
/* Draw icon in the title bar area. */
if ((timeline_ctx->sseq->flag & SEQ_SHOW_OVERLAY) != 0 && !strip.strip_is_too_small &&
strip.can_draw_text_overlay)
{
if ((timeline_ctx->sseq->flag & SEQ_SHOW_OVERLAY) != 0 && !strip.strip_is_too_small) {
uchar col[4];
get_strip_text_color(&strip, col);
float icon_indent = 2.0f * strip.handle_width - 4 * timeline_ctx->pixelx * UI_SCALE_FAC;
rctf rect;
rect.ymin = strip.strip_content_top;
rect.ymin = strip.top - strip_header_size_get(timeline_ctx);
rect.ymax = strip.top;
rect.xmin = max_ff(strip.left_handle, timeline_ctx->v2d->cur.xmin) + icon_indent;
if (missing_data) {