From 59a52fef6cebac25a296a9c8cc76017bf471f7ee Mon Sep 17 00:00:00 2001 From: Aleksandr Zinovev Date: Fri, 11 Aug 2017 13:18:30 +0300 Subject: [PATCH] Pie menu's sub-rows ignore 'EXPAND' flag Regression, to be backported in 2.79. --- source/blender/editors/interface/interface_layout.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 804ffec7997..b4de3d0c5ef 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -247,7 +247,9 @@ static int ui_text_icon_width(uiLayout *layout, const char *name, int icon, bool variable = (ui_layout_vary_direction(layout) == UI_ITEM_VARY_X); if (variable) { - layout->item.flag |= UI_ITEM_MIN; + if (layout->alignment != UI_LAYOUT_ALIGN_EXPAND) { + layout->item.flag |= UI_ITEM_MIN; + } const uiFontStyle *fstyle = UI_FSTYLE_WIDGET; /* it may seem odd that the icon only adds (UI_UNIT_X / 4) * but taking margins into account its fine */