[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17740] branches/blender2.5/blender/source /blender: View2D: Minor tweaks to scrollbar drawing

[Joshua Leung]

Revision: 17740
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17740
Author:   aligorith
Date:     2008-12-07 23:19:41 +0100 (Sun, 07 Dec 2008)

Log Message:
-----------
View2D: Minor tweaks to scrollbar drawing

Handles on ends of bubble are now drawn as rects. When that axis is zoomable, the handles are darker than when they are not.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/view2d.c
    branches/blender2.5/blender/source/blender/makesdna/DNA_view2d_types.h

Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2008-12-07 19:24:41 UTC (rev 17739)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2008-12-07 22:19:41 UTC (rev 17740)
@@ -934,7 +934,7 @@
 /* Draw scrollbars in the given 2d-region */
 void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *scrollers)
 {
-	const int darker= -40, dark= 0, light= 20, lighter= 50;
+	const int darker= -50, midark= -20, dark= 0, light= 20, lighter= 50;
 	rcti vert, hor;
 	
 	vert= v2d->vert;
@@ -952,12 +952,19 @@
 			UI_ThemeColorShade(TH_SHADE1, dark);
 			glRecti(scrollers->hor_min,  hor.ymin+2,  scrollers->hor_max,  hor.ymax-2);
 			
-				/* draw lines on either end of 'box' */
-			glLineWidth(2.0);
+			/* draw 'handles' on either end of bar */
+			if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0)
 				UI_ThemeColorShade(TH_SHADE1, darker);
-				sdrawline(scrollers->hor_min, hor.ymin+2, scrollers->hor_min, hor.ymax-2);
-				sdrawline(scrollers->hor_max, hor.ymin+2, scrollers->hor_max, hor.ymax-2);
-			glLineWidth(1.0);
+			else
+				UI_ThemeColorShade(TH_SHADE1, midark);
+			
+			/* 'minimum' handle */
+			glRecti(scrollers->hor_min-V2D_SCROLLER_HANDLE_SIZE, hor.ymin+2,  
+					scrollers->hor_min+V2D_SCROLLER_HANDLE_SIZE, hor.ymax-2);
+					
+			/* maximum handle */
+			glRecti(scrollers->hor_max-V2D_SCROLLER_HANDLE_SIZE, hor.ymin+2,  
+					scrollers->hor_max+V2D_SCROLLER_HANDLE_SIZE, hor.ymax-2);
 		}
 		
 		/* scale indicators */
@@ -1044,12 +1051,19 @@
 			UI_ThemeColorShade(TH_SHADE1, dark);
 			glRecti(vert.xmin+2,  scrollers->vert_min,  vert.xmax-2,  scrollers->vert_max);
 			
-				/* draw lines on either end of 'box' */
-			glLineWidth(2.0);
+			/* draw 'handles' on either end of bar */
+			if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0)
 				UI_ThemeColorShade(TH_SHADE1, darker);
-				sdrawline(vert.xmin+2, scrollers->vert_min, vert.xmax-2, scrollers->vert_min);
-				sdrawline(vert.xmin+2, scrollers->vert_max, vert.xmax-2, scrollers->vert_max);
-			glLineWidth(1.0);
+			else
+				UI_ThemeColorShade(TH_SHADE1, midark);
+			
+			/* 'minimum' handle */
+			glRecti(vert.xmin+2,  scrollers->vert_min-V2D_SCROLLER_HANDLE_SIZE,  
+					vert.xmax-2,  scrollers->vert_min+V2D_SCROLLER_HANDLE_SIZE);
+					
+			/* maximum handle */
+			glRecti(vert.xmin+2,  scrollers->vert_max-V2D_SCROLLER_HANDLE_SIZE,  
+					vert.xmax-2,  scrollers->vert_max+V2D_SCROLLER_HANDLE_SIZE);
 		}
 		
 		/* scale indiators */

Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_view2d_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_view2d_types.h	2008-12-07 19:24:41 UTC (rev 17739)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_view2d_types.h	2008-12-07 22:19:41 UTC (rev 17740)
@@ -83,7 +83,7 @@
 #define V2D_SCROLL_WIDTH	16
 
 /* half the size (in pixels) of scroller 'handles' */
-#define V2D_SCROLLER_HANDLE_SIZE	8
+#define V2D_SCROLLER_HANDLE_SIZE	5
 
 
 /* scroller flags for View2D (v2d->scroll) */