From 849ee94cf9d2b4ca92a6f30576922ebbeb622ad5 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 18 Nov 2009 10:37:32 +0000 Subject: Partial fixes for #19881: Items existing on the same row as the window dividers are not interactive (selectable, etc.) The View 2D function for handling scrollbar events now takes into account whether the scrollbar is visible or not, so that it won't block events when the scrollbar isn't visible. Also, made the UI code take this into account too for its region testing code. Unforunately, there still seems to be something else which is still preventing UI buttons from being processed when they are in those regions. --- source/blender/editors/interface/view2d_ops.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/blender/editors/interface/view2d_ops.c') diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index ef37f6e530a..79f000113e8 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1285,6 +1285,13 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_PASS_THROUGH; } } + /* zone is also inappropriate if scroller is not visible... */ + if ( ((vsm->scroller=='h') && (v2d->scroll & V2D_SCROLL_HORIZONTAL_HIDE)) || + ((vsm->scroller=='v') && (v2d->scroll & V2D_SCROLL_VERTICAL_HIDE)) ) + { + /* can't catch this event for ourselves, so let it go to someone else? */ + return OPERATOR_PASS_THROUGH; + } if(vsm->scroller=='h') v2d->scroll_ui |= V2D_SCROLL_H_ACTIVE; -- cgit v1.2.3