[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25982] trunk/blender/source/blender/ editors/interface/view2d.c: Fix [#19932] When reducing panels vertically the scrollbar should not continue redraw in

Matt Ebb matt at mke3.net
Thu Jan 14 05:17:50 CET 2010


Revision: 25982
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25982
Author:   broken
Date:     2010-01-14 05:16:45 +0100 (Thu, 14 Jan 2010)

Log Message:
-----------
Fix [#19932] When reducing panels vertically the scrollbar should not continue redraw in 
opposite direction

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d.c

Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c	2010-01-14 02:51:17 UTC (rev 25981)
+++ trunk/blender/source/blender/editors/interface/view2d.c	2010-01-14 04:16:45 UTC (rev 25982)
@@ -1367,6 +1367,9 @@
 	vert.ymin+=4;
 	vert.ymax-=4;
 	
+	CLAMP(vert.ymin, vert.ymin, vert.ymax-V2D_SCROLLER_HANDLE_SIZE);
+	CLAMP(hor.xmin, hor.xmin, hor.xmax-V2D_SCROLLER_HANDLE_SIZE);
+	
 	/* store in scrollers, used for drawing */
 	scrollers->vert= vert;
 	scrollers->hor= hor;
@@ -1597,8 +1600,7 @@
 			
 			state= (v2d->scroll_ui & V2D_SCROLL_H_ACTIVE)?UI_SCROLL_PRESSED:0;
 			
-			// TODO: disable this for button regions... 
-			if (!(v2d->keepzoom & V2D_LOCKZOOM_X))
+			if (!(v2d->keepzoom & V2D_LOCKZOOM_X) && (slider.xmax - slider.xmin > V2D_SCROLLER_HANDLE_SIZE))
 				state |= UI_SCROLL_ARROWS;
 				
 			uiWidgetScrollDraw(&wcol, &hor, &slider, state);
@@ -1695,8 +1697,7 @@
 			
 			state= (v2d->scroll_ui & V2D_SCROLL_V_ACTIVE)?UI_SCROLL_PRESSED:0;
 			
-			// TODO: disable this for button regions...
-			if (!(v2d->keepzoom & V2D_LOCKZOOM_Y)) 
+			if (!(v2d->keepzoom & V2D_LOCKZOOM_Y) && (slider.ymax - slider.ymin > V2D_SCROLLER_HANDLE_SIZE))
 				state |= UI_SCROLL_ARROWS;
 				
 			uiWidgetScrollDraw(&wcol, &vert, &slider, state);





More information about the Bf-blender-cvs mailing list