diff options
| author | Harley Acheson <harley> | 2019-01-04 17:11:51 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-04 17:24:15 +0300 |
| commit | 07c61e0ad8a00eed30480c3dee121ea977deab10 (patch) | |
| tree | 32d30122727e41d6c50b719689b9f414c7bf30e7 /source/blender/editors/interface | |
| parent | 8ca4b8dc8d13726af440925390d1207d46394d06 (diff) | |
UI: alter scrollbar extents to not interfere with split/join areas.
Differential Revision: https://developer.blender.org/D4141
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 35124a78b0a..6352dacad80 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1666,10 +1666,14 @@ View2DScrollers *UI_view2d_scrollers_calc( vert = v2d->vert; hor = v2d->hor; - /* slider rects need to be smaller than region */ + /* slider rects need to be smaller than region and not interfere with splitter areas */ + hor.xmin += UI_HEADER_OFFSET; + hor.xmax -= UI_HEADER_OFFSET; + vert.ymin += UI_HEADER_OFFSET; + vert.ymax -= UI_HEADER_OFFSET; + + /* width of sliders */ smaller = (int)(0.1f * U.widget_unit); - hor.xmin += smaller; - hor.xmax -= smaller; if (scroll & V2D_SCROLL_BOTTOM) hor.ymin += smaller; else @@ -1679,8 +1683,6 @@ View2DScrollers *UI_view2d_scrollers_calc( vert.xmin += smaller; else vert.xmax -= smaller; - vert.ymin += smaller; - vert.ymax -= smaller; CLAMP(vert.ymin, vert.ymin, vert.ymax - V2D_SCROLLER_HANDLE_SIZE); CLAMP(hor.xmin, hor.xmin, hor.xmax - V2D_SCROLLER_HANDLE_SIZE); |