Chromium Code Reviews| Index: ui/views/layout/box_layout.cc |
| diff --git a/ui/views/layout/box_layout.cc b/ui/views/layout/box_layout.cc |
| index 59c21c52f4a8c9c89eae094a1af48d8f562fcc7b..45be060ede71cd6693487e343b11814e2701e343 100644 |
| --- a/ui/views/layout/box_layout.cc |
| +++ b/ui/views/layout/box_layout.cc |
| @@ -162,6 +162,7 @@ gfx::Size BoxLayout::GetPreferredSize(const View* host) const { |
| width = std::max(width, child->GetPreferredSize().width()); |
| } |
| + width = std::max(width, minimum_cross_axis_size_); |
|
benwells
2014/08/26 22:05:51
Nit: initialize minimum_cross_axis_size_
calamity
2014/08/27 03:59:33
Done.
|
| } |
| return GetPreferredSizeForChildWidth(host, width); |
| @@ -278,6 +279,8 @@ gfx::Size BoxLayout::GetPreferredSizeForChildWidth(const View* host, |
| child_area_bounds.Union(child_bounds); |
| position += size.width() + between_child_spacing_; |
| } |
| + child_area_bounds.set_height( |
| + std::max(child_area_bounds.height(), minimum_cross_axis_size_)); |
| } else { |
| int height = 0; |
| for (int i = 0; i < host->child_count(); ++i) { |