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:
authorJacques Lucke <mail@jlucke.com>2019-03-18 19:28:36 +0300
committerJacques Lucke <mail@jlucke.com>2019-03-18 19:28:52 +0300
commitad3d9256821c197c44c6565ef2797cf361f12ec9 (patch)
tree1ff1b520ac3f3bcdbb65d09a1c618e5978d31e5d /source/blender/editors/space_nla/nla_draw.c
parent8fb0b9aebbd409216dec77c4b1bf2a2fbba80698 (diff)
Fix T62636: Overlapping scrollbar in driver editor
Instead of only `ymin` and `ymax`, `ANIM_channel_draw_widgets` has a rectangle as input now. This allows the caller to set a custom width for the channel. Some space types need the extra space for the scrollbar (drivers, graph), but the other don't have a scrollbar. Reviewers: brecht Differential Revision: https://developer.blender.org/D4543
Diffstat (limited to 'source/blender/editors/space_nla/nla_draw.c')
-rw-r--r--source/blender/editors/space_nla/nla_draw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index c73fd768075..48eb2bdb82b 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -843,7 +843,9 @@ void draw_nla_channel_list(const bContext *C, bAnimContext *ac, ARegion *ar)
IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax) )
{
/* draw all channels using standard channel-drawing API */
- ANIM_channel_draw_widgets(C, ac, ale, block, yminc, ymaxc, channel_index);
+ rctf channel_rect;
+ BLI_rctf_init(&channel_rect, 0, v2d->cur.xmax, yminc, ymaxc);
+ ANIM_channel_draw_widgets(C, ac, ale, block, &channel_rect, channel_index);
}
/* adjust y-position for next one */