Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: ui/aura_shell/image_grid_unittest.cc

Issue 8821028: aura: Draw shadows around tooltip windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: increase horizontal padding Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura_shell/image_grid.cc ('k') | ui/aura_shell/shell_tooltip_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/image_grid_unittest.cc
diff --git a/ui/aura_shell/image_grid_unittest.cc b/ui/aura_shell/image_grid_unittest.cc
index e75bd403c224ea8565ec19eb2a8f40046e42db0f..185a0fae257aa018dad81115f2e0569137944c14 100644
--- a/ui/aura_shell/image_grid_unittest.cc
+++ b/ui/aura_shell/image_grid_unittest.cc
@@ -180,7 +180,6 @@ TEST_F(ImageGridTest, SmallerSides) {
test_api.GetTransformedLayerBounds(
*test_api.top_layer()).ToString());
-
// The left layer should be flush with the left edge and stretched vertically
// between the top left corner and the bottom.
EXPECT_EQ(gfx::Rect(
@@ -197,5 +196,77 @@ TEST_F(ImageGridTest, SmallerSides) {
*test_api.right_layer()).ToString());
}
+// Test that we hide or clip layers as needed when the grid is assigned a small
+// size.
+TEST_F(ImageGridTest, TooSmall) {
+ const int kCorner = 5;
+ const int kCenter = 3;
+ const int kEdge = 3;
+
+ scoped_ptr<gfx::Image> top_left_image(
+ CreateImage(gfx::Size(kCorner, kCorner)));
+ scoped_ptr<gfx::Image> top_image(CreateImage(gfx::Size(kEdge, kEdge)));
+ scoped_ptr<gfx::Image> top_right_image(
+ CreateImage(gfx::Size(kCorner, kCorner)));
+ scoped_ptr<gfx::Image> left_image(CreateImage(gfx::Size(kEdge, kEdge)));
+ scoped_ptr<gfx::Image> center_image(CreateImage(gfx::Size(kCenter, kCenter)));
+ scoped_ptr<gfx::Image> right_image(CreateImage(gfx::Size(kEdge, kEdge)));
+ scoped_ptr<gfx::Image> bottom_left_image(
+ CreateImage(gfx::Size(kCorner, kCorner)));
+ scoped_ptr<gfx::Image> bottom_image(CreateImage(gfx::Size(kEdge, kEdge)));
+ scoped_ptr<gfx::Image> bottom_right_image(
+ CreateImage(gfx::Size(kCorner, kCorner)));
+
+ ImageGrid grid;
+ grid.Init(
+ top_left_image.get(), top_image.get(), top_right_image.get(),
+ left_image.get(), center_image.get(), right_image.get(),
+ bottom_left_image.get(), bottom_image.get(), bottom_right_image.get());
+ ImageGrid::TestAPI test_api(&grid);
+
+ // Set a size that's smaller than the combined (unscaled) corner images.
+ const gfx::Size kSmallSize(kCorner + kCorner - 3, kCorner + kCorner - 5);
+ grid.SetSize(kSmallSize);
+
+ // The scalable images around the sides and in the center should be hidden.
+ EXPECT_FALSE(test_api.top_layer()->visible());
+ EXPECT_FALSE(test_api.bottom_layer()->visible());
+ EXPECT_FALSE(test_api.left_layer()->visible());
+ EXPECT_FALSE(test_api.right_layer()->visible());
+ EXPECT_FALSE(test_api.center_layer()->visible());
+
+ // The corner images' clip rects should sum to the expected size.
+ EXPECT_EQ(kSmallSize.width(),
+ test_api.top_left_clip_rect().width() +
+ test_api.top_right_clip_rect().width());
+ EXPECT_EQ(kSmallSize.width(),
+ test_api.bottom_left_clip_rect().width() +
+ test_api.bottom_right_clip_rect().width());
+ EXPECT_EQ(kSmallSize.height(),
+ test_api.top_left_clip_rect().height() +
+ test_api.bottom_left_clip_rect().height());
+ EXPECT_EQ(kSmallSize.height(),
+ test_api.top_right_clip_rect().height() +
+ test_api.bottom_right_clip_rect().height());
+
+ // Resize the grid to be large enough to show all images.
+ const gfx::Size kLargeSize(kCorner + kCorner + kCenter,
+ kCorner + kCorner + kCenter);
+ grid.SetSize(kLargeSize);
+
+ // The scalable images should be visible now.
+ EXPECT_TRUE(test_api.top_layer()->visible());
+ EXPECT_TRUE(test_api.bottom_layer()->visible());
+ EXPECT_TRUE(test_api.left_layer()->visible());
+ EXPECT_TRUE(test_api.right_layer()->visible());
+ EXPECT_TRUE(test_api.center_layer()->visible());
+
+ // We shouldn't be clipping the corner images anymore.
+ EXPECT_TRUE(test_api.top_left_clip_rect().IsEmpty());
+ EXPECT_TRUE(test_api.top_right_clip_rect().IsEmpty());
+ EXPECT_TRUE(test_api.bottom_left_clip_rect().IsEmpty());
+ EXPECT_TRUE(test_api.bottom_right_clip_rect().IsEmpty());
+}
+
} // namespace test
} // namespace aura_shell
« no previous file with comments | « ui/aura_shell/image_grid.cc ('k') | ui/aura_shell/shell_tooltip_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698