diff options
| author | Andrea Weikert <elubie@gmx.net> | 2012-08-01 21:52:14 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2012-08-01 21:52:14 +0400 |
| commit | b876ca5611a74eceed6ca9108c7d7ec2f15d4457 (patch) | |
| tree | 64062bde8a1e98496eb01a1b60c9206f3ce76abd | |
| parent | ed36c625eedf5644cc52d253171338609aef10ca (diff) | |
fix: column flow layout wrongly calculated height of second and subsequent columns when used with more than 2 columns.
* discovered while playing with the column flow layout in asset branch.
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 3270015271a..10fde402acc 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1960,6 +1960,7 @@ static void ui_litem_estimate_column_flow(uiLayout *litem) x += maxw + litem->space; maxw = 0; y = 0; + emy = 0; /* need to reset height again for next column */ col++; } } @@ -2010,6 +2011,7 @@ static void ui_litem_layout_column_flow(uiLayout *litem) if (col < flow->totcol - 1 && emy <= -emh) { x += itemw + style->columnspace; y = litem->y; + emy = 0; /* need to reset height again for next column */ col++; } } |