[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33237] trunk/blender/source/blender/ editors/interface/interface.c: Bugfix #24856

[Ton Roosendaal]

Revision: 33237
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33237
Author:   ton
Date:     2010-11-22 19:11:40 +0100 (Mon, 22 Nov 2010)

Log Message:
-----------
Bugfix #24856

Button aligning revisited. Now layer buttons draw OK too, and even 
better than before (missed a rounded corner!)

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

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2010-11-22 17:21:18 UTC (rev 33236)
+++ trunk/blender/source/blender/editors/interface/interface.c	2010-11-22 18:11:40 UTC (rev 33237)
@@ -2262,14 +2262,17 @@
 			else {	/* next button switches to new row */
 				
 				if(prev && buts_are_horiz(prev, but))
-				   flag |= UI_BUT_ALIGN_LEFT;
+					flag |= UI_BUT_ALIGN_LEFT;
+				else
+					flag |= UI_BUT_ALIGN_TOP;
 				
 				if( (flag & UI_BUT_ALIGN_TOP)==0) {	/* stil top row */
 					if(prev) {
 						if(next && buts_are_horiz(but, next))
-							flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_RIGHT;
+							flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT|UI_BUT_ALIGN_RIGHT;
 						else {
-							flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_TOP;
+							/* last button in top row */
+							flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT;
 						}
 					}
 					else