diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-27 16:11:25 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-27 16:11:25 +0400 |
commit | 1448d188a126ebd1e47dd30fade43fa5749f8b17 (patch) | |
tree | 85b1570121211f0d2bf92c17e2f6ccf273e2e051 /source/blender/editors | |
parent | 31362c865f6e392c5948ecdb63b984cf28979044 (diff) |
Fix #22950: width of a layout object does not propagate to its sub-layout
objects (row, column, box, etc.). Patch by Tamito Kajiyama, thanks!
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); |