diff options
| author | raa <roaoao@gmail.com> | 2017-03-26 12:19:01 +0300 |
|---|---|---|
| committer | raa <roaoao@gmail.com> | 2017-03-26 12:19:01 +0300 |
| commit | 4bdb2d4885671113e40e41c9e3f1de097b5bfd4b (patch) | |
| tree | eefe23bbb70d9c05653cf64b06584215c163db2c | |
| parent | fa63515c37587b1ec5fde2a13986cdbd099236bd (diff) | |
Fix: Ignore min flag for rows that require all available width
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 76fa1720863..f5b2a444173 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2171,7 +2171,16 @@ static void ui_litem_layout_row(uiLayout *litem) x += neww; - if ((neww < minw || itemw == minw || item->flag & UI_ITEM_MIN) && w != 0) { + 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) { + min_flag = false; + } + + if ((neww < minw || min_flag) && w != 0) { /* fixed size */ item->flag |= UI_ITEM_FIXED; if (item->type != ITEM_BUTTON && item->flag & UI_ITEM_MIN) { |