archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: alter scrollbar extents to not interfere with split/join areas.

Browse Source 
Differential Revision: https://developer.blender.org/D4141
This commit is contained in:
Harley Acheson
2019-01-04 15:11:51 +01:00
committed by Brecht Van Lommel
parent 8ca4b8dc8d
commit 07c61e0ad8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/view2d.c
View File

@@ -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);