Add main axis alignment for BoxLayout.

ui/views/layout/box_layout_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/layout/box_layout.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/view.h"
 
@@ skipping 138 matching lines @@
 
     EXPECT_EQ(v2->GetPreferredSize().width(), host_->bounds().width()) << i;
     EXPECT_EQ(v2->GetPreferredSize().height(), host_->bounds().height()) << i;
     EXPECT_EQ(v1->GetPreferredSize().width(), v1->bounds().width()) << i;
     EXPECT_EQ(v1->GetPreferredSize().height(), v1->bounds().height()) << i;
     EXPECT_EQ(v2->GetPreferredSize().width(), v2->bounds().width()) << i;
     EXPECT_EQ(v2->GetPreferredSize().height(), v2->bounds().height()) << i;
   }
 }
 
+TEST_F(BoxLayoutTest, BoxPackHorizontal) {
+  layout_.reset(new BoxLayout(BoxLayout::kHorizontal, 10, 10, 10));
+
+  View* v1 = new StaticSizedView(gfx::Size(20, 20));
+  host_->AddChildView(v1);
+  View* v2 = new StaticSizedView(gfx::Size(10, 10));
+  host_->AddChildView(v2);
+
+  host_->SetBounds(0, 0, 100, 40);
+
+  // Aligns children to the center horizontally.

[benwells, 2014/05/13 02:48:05]

Before testing CENTER and END, add two more test cases, that default lays out as
start, and then set to start and test like that.

[benwells, 2014/05/13 02:48:05]

Also I think there should be some testing of when the children take up more
space than is available.

[calamity, 2014/05/13 04:29:29]

Done.

[calamity, 2014/05/13 04:29:29]

Done.

+  layout_->set_box_pack(BoxLayout::BOX_PACK_CENTER);
+  layout_->Layout(host_.get());
+  EXPECT_EQ(gfx::Rect(30, 10, 20, 20).ToString(), v1->bounds().ToString());
+  EXPECT_EQ(gfx::Rect(60, 10, 10, 20).ToString(), v2->bounds().ToString());
+
+  // Aligns children to the end of the host horizontally, accounting for the
+  // inside border spacing.
+  layout_->set_box_pack(BoxLayout::BOX_PACK_END);
+  layout_->Layout(host_.get());
+  EXPECT_EQ(gfx::Rect(50, 10, 20, 20).ToString(), v1->bounds().ToString());
+  EXPECT_EQ(gfx::Rect(80, 10, 10, 20).ToString(), v2->bounds().ToString());
+}
+
+TEST_F(BoxLayoutTest, BoxPackVertical) {
+  layout_.reset(new BoxLayout(BoxLayout::kVertical, 10, 10, 10));
+
+  View* v1 = new StaticSizedView(gfx::Size(20, 20));
+  host_->AddChildView(v1);
+  View* v2 = new StaticSizedView(gfx::Size(10, 10));
+  host_->AddChildView(v2);
+
+  host_->SetBounds(0, 0, 40, 100);
+
+  // Aligns children to the center vertically.
+  layout_->set_box_pack(BoxLayout::BOX_PACK_CENTER);
+  layout_->Layout(host_.get());
+  EXPECT_EQ(gfx::Rect(10, 30, 20, 20).ToString(), v1->bounds().ToString());
+  EXPECT_EQ(gfx::Rect(10, 60, 20, 10).ToString(), v2->bounds().ToString());
+
+  // Aligns children to the end of the host vertically, accounting for the
+  // inside border spacing.
+  layout_->set_box_pack(BoxLayout::BOX_PACK_END);
+  layout_->Layout(host_.get());
+  EXPECT_EQ(gfx::Rect(10, 50, 20, 20).ToString(), v1->bounds().ToString());
+  EXPECT_EQ(gfx::Rect(10, 80, 20, 10).ToString(), v2->bounds().ToString());
+}
+
 }  // namespace views