[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11895] branches/imgbrowser-elubie/source/ blender/src/drawimasel.c: == imagebrowser ==

[Andrea Weikert]

Revision: 11895
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11895
Author:   elubie
Date:     2007-08-30 20:30:38 +0200 (Thu, 30 Aug 2007)

Log Message:
-----------
== imagebrowser ==
small tweak to nicer drawing scrollbar inside embossed area

Modified Paths:
--------------
    branches/imgbrowser-elubie/source/blender/src/drawimasel.c

Modified: branches/imgbrowser-elubie/source/blender/src/drawimasel.c
===================================================================
--- branches/imgbrowser-elubie/source/blender/src/drawimasel.c	2007-08-30 17:26:26 UTC (rev 11894)
+++ branches/imgbrowser-elubie/source/blender/src/drawimasel.c	2007-08-30 18:30:38 UTC (rev 11895)
@@ -104,7 +104,7 @@
 
 void calc_imasel_rcts(SpaceImaSel *simasel, int winx, int winy)
 {	
-	int width = (int)20.0f*simasel->aspect;
+	int width = (int)16.0f*simasel->aspect;
 	int numtiles;
 	int numfiles = 0;
 	int tilewidth = simasel->prv_w + TILE_BORDER_X*4;
@@ -117,10 +117,10 @@
 
 	// vertical scroll bar
 	simasel->v2d.vert= simasel->v2d.mask;
-	simasel->v2d.vert.xmax -= TILE_BORDER_X;
-	simasel->v2d.vert.xmin= simasel->v2d.vert.xmax- width - TILE_BORDER_X;
-	simasel->v2d.vert.ymax -= IMASEL_BUTTONS_HEIGHT + TILE_BORDER_Y + 1;
-	simasel->v2d.vert.ymin += TILE_BORDER_Y + 1;
+	simasel->v2d.vert.xmax -= TILE_BORDER_X + 2;
+	simasel->v2d.vert.xmin= simasel->v2d.vert.xmax- width - TILE_BORDER_X - 2;
+	simasel->v2d.vert.ymax -= IMASEL_BUTTONS_HEIGHT + TILE_BORDER_Y + 2;
+	simasel->v2d.vert.ymin += TILE_BORDER_Y + 2;
 	// simasel->v2d.mask.xmax= simasel->v2d.vert.xmin;
 	
 	if (simasel->flag & FILE_BOOKMARKS) {
@@ -704,6 +704,9 @@
 	/* bookmarks */
 	draw_imasel_bookmarks(sa, simasel);
 
+	uiEmboss(simasel->viewrect.xmin, simasel->viewrect.ymin, simasel->v2d.mask.xmax-TILE_BORDER_X, simasel->viewrect.ymax, 1);
+
+
 	glScissor(sa->winrct.xmin + simasel->viewrect.xmin , 
 			  sa->winrct.ymin + simasel->viewrect.ymin, 
 			  simasel->viewrect.xmax - simasel->viewrect.xmin , 
@@ -714,8 +717,7 @@
 	
 	/* BIF_ThemeColor(TH_HEADER);*/
 	/* glRecti(simasel->viewrect.xmin,  simasel->viewrect.ymin,  simasel->viewrect.xmax,  simasel->viewrect.ymax);*/
-	uiEmboss(simasel->viewrect.xmin, simasel->viewrect.ymin, simasel->viewrect.xmax-1, simasel->viewrect.ymax-1, 1);
-
+	
 	/* restore viewport (not needed yet) */
 	mywinset(sa->win);