diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-05-11 21:05:10 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-05-11 21:05:10 +0400 |
| commit | fe33fc8db31ab1af9554f8bf1df88d93187da4d5 (patch) | |
| tree | 4e458b87bfac4598935eaf4c0651884d5e86f6dc /source/blender/editors | |
| parent | c8da0d01d401e2d947c320a94bf5878febdd93f1 (diff) | |
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.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 28ceabdd344..958ee9f5420 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1776,12 +1776,12 @@ static void ui_litem_layout_row(uiLayout *litem) /* 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 */ |