[Bf-blender-cvs] [d2b5f0f] master: UI: fix own error, dont add slider pad when neither sides align
Campbell Barton
noreply at git.blender.org
Mon Feb 10 17:42:48 CET 2014
Commit: d2b5f0f6c26b7c5568203b4427537fe9ab80055c
Author: Campbell Barton
Date: Tue Feb 11 03:37:29 2014 +1100
https://developer.blender.org/rBd2b5f0f6c26b7c5568203b4427537fe9ab80055c
UI: fix own error, dont add slider pad when neither sides align
===================================================================
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 43b2c68..759e40a 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2736,9 +2736,9 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s
widgetbase_draw(&wtb, wcol);
/* text space */
- if ((roundboxalign & UI_CNR_TOP_LEFT) && (roundboxalign & UI_CNR_BOTTOM_LEFT))
+ if ((roundboxalign & UI_CNR_TOP_LEFT) || (roundboxalign & UI_CNR_BOTTOM_LEFT))
rect->xmin += toffs;
- if ((roundboxalign & UI_CNR_TOP_RIGHT) && (roundboxalign & UI_CNR_BOTTOM_RIGHT))
+ if ((roundboxalign & UI_CNR_TOP_RIGHT) || (roundboxalign & UI_CNR_BOTTOM_RIGHT))
rect->xmax -= toffs;
}
More information about the Bf-blender-cvs
mailing list