Commit: 28451a9cec72c547c65a980ed5a5b6885e298a15
Author: Aleksandr Zinovev
Date: Fri Aug 11 13:18:30 2017 +0300
Branches: blender-v2.79-release
https://developer.blender.org/rB28451a9cec72c547c65a980ed5a5b6885e298a15
Pie menu's sub-rows ignore 'EXPAND' flag
Regression, to be backported in 2.79.
===================================================================
M source/blender/editors/interface/interface_layout.c
===================================================================
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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
