[Bf-blender-cvs] [07c61e0ad8a] master: UI: alter scrollbar extents to not interfere with split/join areas.

[Harley Acheson]

Commit: 07c61e0ad8a00eed30480c3dee121ea977deab10
Author: Harley Acheson
Date:   Fri Jan 4 15:11:51 2019 +0100
Branches: master
https://developer.blender.org/rB07c61e0ad8a00eed30480c3dee121ea977deab10

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

Differential Revision: https://developer.blender.org/D4141

===================================================================

M	source/blender/editors/interface/view2d.c

===================================================================

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