[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20304] branches/blender2.5/blender/source /blender/editors: UI:

[Brecht Van Lommel]

Revision: 20304
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20304
Author:   blendix
Date:     2009-05-20 19:18:48 +0200 (Wed, 20 May 2009)

Log Message:
-----------
UI:
* Hide enable button in horizontal collapsed panels.
* Fix enable button not being in correct position when zooming.
* Fix n-key panels layout being messed up.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
    branches/blender2.5/blender/source/blender/editors/screen/area.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c	2009-05-20 17:18:47 UTC (rev 20303)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c	2009-05-20 17:18:48 UTC (rev 20304)
@@ -1346,7 +1346,7 @@
 		scaley= (float)litem->h/(float)toth;
 	
 	x= litem->x;
-	y= litem->y - scalex*toth;
+	y= litem->y - scaley*toth;
 
 	for(item=litem->items.first; item; item=item->next) {
 		ui_item_offset(item, &itemx, &itemy);

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c	2009-05-20 17:18:47 UTC (rev 20303)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c	2009-05-20 17:18:48 UTC (rev 20304)
@@ -451,10 +451,8 @@
 				nr++;
 	
 	/* + 0.001f to avoid flirting with float inaccuracy */
-	if(panel->control & UI_PNL_CLOSE) pnl_icons=(2*PNL_ICON+5)/block->aspect + 0.001f;
-	else pnl_icons= (PNL_ICON+5)/block->aspect + 0.001f;
-
-	pnl_icons += panel->labelofs;
+	if(panel->control & UI_PNL_CLOSE) pnl_icons=(panel->labelofs+2*PNL_ICON+5)/block->aspect + 0.001f;
+	else pnl_icons= (panel->labelofs+PNL_ICON+5)/block->aspect + 0.001f;
 	
 	if(nr==1) {
 		

Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-05-20 17:18:47 UTC (rev 20303)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-05-20 17:18:48 UTC (rev 20304)
@@ -1004,7 +1004,7 @@
 			if(vertical)
 				y -= header;
 
-			if(pt->draw_header) {
+			if(pt->draw_header && (open || vertical)) {
 				/* for enabled buttons */
 				panel->layout= uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER,
 					triangle, header+style->panelspace, header, 1, style);