Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Beconcini <beco>2021-11-18 04:07:21 +0300
committerRichard Antalik <richardantalik@gmail.com>2021-11-18 04:14:11 +0300
commitdaaa43232d34a13cd63caedb8ffc8f2acddd86e0 (patch)
tree23db00d6086ca71375e159df8193bb7e5ada5ec3 /source/blender/editors/space_sequencer/sequencer_draw.c
parentd8fd575af9cdb66dcc3e50cc3b1b5c41ad049b4f (diff)
Fix T92445: Thumbnail height without overlay text
This patch changes the thumbnails' height used for image and movie strips by choosing the proper size according to the VSE's text overlay settings: i.e. thumbnails use the whole strip's height when no overlay text is displayed; otherwise, some space is left for the overlay. Reviewed By: ISS Differential Revision: https://developer.blender.org/D13043
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 72e39d369a5..2bbc346fb50 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1389,7 +1389,8 @@ static void draw_seq_strip(const bContext *C,
if ((sseq->flag & SEQ_SHOW_OVERLAY) &&
(sseq->timeline_overlay.flag & SEQ_TIMELINE_SHOW_THUMBNAILS) &&
(ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE))) {
- draw_seq_strip_thumbnail(v2d, C, scene, seq, y1, y2, pixelx, pixely);
+ draw_seq_strip_thumbnail(
+ v2d, C, scene, seq, y1, y_threshold ? text_margin_y : y2, pixelx, pixely);
}
if ((sseq->flag & SEQ_SHOW_OVERLAY) &&