[Bf-blender-cvs] [9ad88fb] master: Fix for error exposed by right-align number buttons

[Campbell Barton]

Commit: 9ad88fbe6d88ab5bedb466cd8e0523cc9d52c71c
Author: Campbell Barton
Date:   Fri Dec 13 02:47:00 2013 +1100
http://developer.blender.org/rB9ad88fbe6d88ab5bedb466cd8e0523cc9d52c71c

Fix for error exposed by right-align number buttons

When the entire label was clipped, the right aligned number component
could be clipped on its left hand side too.
So "Foo: 1.00" could be clipped to ".00"

===================================================================

M	source/blender/editors/interface/interface_widgets.c

===================================================================

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 9826f07..a49f9b1 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1311,14 +1311,18 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB
 		rect->xmin += (int)(0.8f * BLI_rcti_size_y(rect));
 
 		if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) {
-			rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
+			if (but->editstr || but->ofs == 0) {
+				rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
+			}
 		}
 		else if ((but->drawflag & UI_BUT_TEXT_RIGHT)) {
 			rect->xmax -= (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
 		}
 	}
 	else if ((but->drawflag & UI_BUT_TEXT_LEFT)) {
-		rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
+		if (but->ofs == 0) {
+			rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;
+		}
 	}
 	else if ((but->drawflag & UI_BUT_TEXT_RIGHT)) {
 		rect->xmax -= (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect;