[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46554] trunk/blender/source/blender/ editors/interface/interface_layout.c: Fix for UI layout alignment of fixed-size items ( including those with width < min.

[Lukas Toenne]

Revision: 46554
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46554
Author:   lukastoenne
Date:     2012-05-11 17:05:10 +0000 (Fri, 11 May 2012)
Log Message:
-----------
Fix for UI layout alignment of fixed-size items (including those with width < min. width). Such layout items were ignoring the center and right alignment in layouts before.

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

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2012-05-11 16:11:52 UTC (rev 46553)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2012-05-11 17:05:10 UTC (rev 46554)
@@ -1776,12 +1776,12 @@
 		/* align right/center */
 		offset = 0;
 		if (litem->alignment == UI_LAYOUT_ALIGN_RIGHT) {
-			if (freew > 0 && freew < w - fixedw)
-				offset = (w - fixedw) - freew;
+			if (freew + fixedw > 0 && freew + fixedw < w)
+				offset = w - (fixedw + freew);
 		}
 		else if (litem->alignment == UI_LAYOUT_ALIGN_CENTER) {
-			if (freew > 0 && freew < w - fixedw)
-				offset = ((w - fixedw) - freew) / 2;
+			if (freew + fixedw > 0 && freew + fixedw < w)
+				offset = (w - (fixedw + freew)) / 2;
 		}
 
 		/* position item */