[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42187] trunk/blender/source/blender/ editors: UI: tweak to panel header padding, made region expander a bit smaller and

[Brecht Van Lommel]

Revision: 42187
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42187
Author:   blendix
Date:     2011-11-27 14:06:47 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
UI: tweak to panel header padding, made region expander a bit smaller and
fix bug #29422, left expander drawing over adjacent editor.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_panel.c
    trunk/blender/source/blender/editors/screen/area.c

Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c	2011-11-27 10:35:00 UTC (rev 42186)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c	2011-11-27 14:06:47 UTC (rev 42187)
@@ -494,7 +494,7 @@
 	/* calculate header rect */
 	/* + 0.001f to prevent flicker due to float inaccuracy */
 	headrect= *rect;
-	headrect.ymin= headrect.ymax - 2.0f/block->aspect;
+	headrect.ymin= headrect.ymax;
 	headrect.ymax= headrect.ymin + floor(PNL_HEADER/block->aspect + 0.001f);
 	
 	{
@@ -508,7 +508,7 @@
 			/* draw with background color */
 			glEnable(GL_BLEND);
 			glColor4ubv((unsigned char*)btheme->tui.panel.header);
-			glRectf(minx, headrect.ymin, maxx, y);
+			glRectf(minx, headrect.ymin+1, maxx, y);
 
 			fdrawline(minx, y, maxx, y);
 			fdrawline(minx, y, maxx, y);

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2011-11-27 10:35:00 UTC (rev 42186)
+++ trunk/blender/source/blender/editors/screen/area.c	2011-11-27 14:06:47 UTC (rev 42187)
@@ -262,12 +262,12 @@
 			break;
 	}
 
-	glColor4f(0.05f, 0.05f, 0.05f, 0.5f);
+	glColor4f(0.05f, 0.05f, 0.05f, 0.4f);
 	uiRoundBox((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2, 4.0f);
 
 	glEnable(GL_BLEND);
 
-	glColor4f(0.8f, 0.8f, 0.8f, 0.5f);
+	glColor4f(0.8f, 0.8f, 0.8f, 0.4f);
 	draw_azone_plus((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2);
 
 	glDisable(GL_BLEND);
@@ -711,8 +711,8 @@
 	}
 }
 
-#define AZONEPAD_TAB_PLUSW	16
-#define AZONEPAD_TAB_PLUSH	16
+#define AZONEPAD_TAB_PLUSW	14
+#define AZONEPAD_TAB_PLUSH	14
 
 /* region already made zero sized, in shape of edge */
 static void region_azone_tab_plus(ScrArea *sa, AZone *az, ARegion *ar)
@@ -739,9 +739,9 @@
 			az->y2= ar->winrct.ymin;
 			break;
 		case AE_LEFT_TO_TOPRIGHT:
-			az->x1= ar->winrct.xmin + 1 - AZONEPAD_TAB_PLUSH;
+			az->x1= ar->winrct.xmin - AZONEPAD_TAB_PLUSH;
 			az->y1= ar->winrct.ymax - 2.5*AZONEPAD_TAB_PLUSW;
-			az->x2= ar->winrct.xmin + 1;
+			az->x2= ar->winrct.xmin;
 			az->y2= ar->winrct.ymax - 1.5*AZONEPAD_TAB_PLUSW;
 			break;
 		case AE_RIGHT_TO_TOPLEFT: