From 0269ff6589bc8729cbdb93f30ee27eebd04207e7 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 21 Jul 2010 23:17:37 +0000 Subject: [PATCH] Temporary fix for a bug that the width of a layout object is not propagated to its sub-layout objects such as row, column, box, etc. Due to this bug, layout.template_curve_mapping() shows a zero-height curve window when the function is called with respect to a sub-layout object. This issue should be fixed in the trunk as well. --- source/blender/editors/interface/interface_layout.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index b7b9a2156ef..c2bcc673c1e 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2002,6 +2002,7 @@ uiLayout *uiLayoutRow(uiLayout *layout, int align) litem->enabled= 1; litem->context= layout->context; litem->space= (align)? 0: layout->root->style->buttonspacex; + litem->w = layout->w; BLI_addtail(&layout->items, litem); uiBlockSetCurLayout(layout->root->block, litem); @@ -2021,6 +2022,7 @@ uiLayout *uiLayoutColumn(uiLayout *layout, int align) litem->enabled= 1; litem->context= layout->context; litem->space= (litem->align)? 0: layout->root->style->buttonspacey; + litem->w = layout->w; BLI_addtail(&layout->items, litem); uiBlockSetCurLayout(layout->root->block, litem); @@ -2040,6 +2042,7 @@ uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align) flow->litem.enabled= 1; flow->litem.context= layout->context; flow->litem.space= (flow->litem.align)? 0: layout->root->style->columnspace; + flow->litem.w = layout->w; flow->number= number; BLI_addtail(&layout->items, flow); @@ -2059,6 +2062,7 @@ static uiLayoutItemBx *ui_layout_box(uiLayout *layout, int type) box->litem.enabled= 1; box->litem.context= layout->context; box->litem.space= layout->root->style->columnspace; + box->litem.w = layout->w; BLI_addtail(&layout->items, box); uiBlockSetCurLayout(layout->root->block, &box->litem);