diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-01 04:09:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-01 04:09:17 +0300 |
| commit | e1fb0807437644b2e20d3edac8d4aef92e0f5877 (patch) | |
| tree | 7e02411419c1fe1e54262f7d60d4e307a530d7b1 /source/blender/editors/interface | |
| parent | 6c42079b78743845c67dfc42682c6eed057a2242 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 7b0921941e7..9b6547cf8a1 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2174,12 +2174,13 @@ static void ui_litem_layout_row(uiLayout *litem) bool min_flag = item->flag & UI_ITEM_MIN; /* ignore min flag for rows with right or center alignment */ if (item->type != ITEM_BUTTON && - ELEM(((uiLayout *)item)->alignment, UI_LAYOUT_ALIGN_RIGHT, UI_LAYOUT_ALIGN_CENTER) && - litem->alignment == UI_LAYOUT_ALIGN_EXPAND && - ((uiItem *)litem)->flag & UI_ITEM_MIN) { + ELEM(((uiLayout *)item)->alignment, UI_LAYOUT_ALIGN_RIGHT, UI_LAYOUT_ALIGN_CENTER) && + litem->alignment == UI_LAYOUT_ALIGN_EXPAND && + ((uiItem *)litem)->flag & UI_ITEM_MIN) + { min_flag = false; } - + if ((neww < minw || min_flag) && w != 0) { /* fixed size */ item->flag |= UI_ITEM_FIXED; |