Provide an alignment option in RoundedImageView

This CL provides an alignment option in RoundedImageView to specify
which portion of the image should be drawn. It's useful when the image's
size is greater than the view's.

Bug: 1133020
Change-Id: I923f4fcb763b8a1c17a18471148264ef21f7ed73
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443492
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812914}

ash/clipboard/views/clipboard_history_bitmap_item_view.cc

@@ -57,7 +57,8 @@ class FadeImageView : public RoundedImageView,
                 const ClipboardHistoryItem* clipboard_history_item,
                 const ClipboardHistoryResourceManager* resource_manager,
                 float opacity)
-      : RoundedImageView(kRoundedCornerRadius),
+      : RoundedImageView(kRoundedCornerRadius,
+                         RoundedImageView::Alignment::kCenter),
         bitmap_item_view_(bitmap_item_view),
         resource_manager_(resource_manager),
         clipboard_history_item_(*clipboard_history_item),
@@ -260,8 +261,8 @@ ClipboardHistoryBitmapItemView::BuildImageView() {
                                              resource_manager_,
                                              GetContentsOpacity());
     case ui::ClipboardInternalFormat::kBitmap: {
-      auto image_view =
-          std::make_unique<RoundedImageView>(kRoundedCornerRadius);
+      auto image_view = std::make_unique<RoundedImageView>(
+          kRoundedCornerRadius, RoundedImageView::Alignment::kCenter);
       gfx::ImageSkia bitmap_image = gfx::ImageSkia::CreateFrom1xBitmap(
           clipboard_history_item()->data().bitmap());
       if (GetContentsOpacity() != 1.f) {

ash/public/cpp/rounded_image_view.cc

@@ -12,7 +12,8 @@
 
 namespace ash {
 
-RoundedImageView::RoundedImageView(int corner_radius) {
+RoundedImageView::RoundedImageView(int corner_radius, Alignment alignment)
+    : alignment_(alignment) {
   for (int i = 0; i < 4; ++i)
     corner_radius_[i] = corner_radius;
 }
@@ -72,7 +73,21 @@ void RoundedImageView::OnPaint(gfx::Canvas* canvas) {
   path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius);
   cc::PaintFlags flags;
   flags.setAntiAlias(true);
-  canvas->DrawImageInPath(resized_image_, image_bounds.x(), image_bounds.y(),
+
+  gfx::ImageSkia image_to_draw;
+  switch (alignment_) {
+    case Alignment::kLeading:
+      image_to_draw = resized_image_;
+      break;
+    case Alignment::kCenter:
+      gfx::Rect preferred_size(GetImageSize());
+      preferred_size.ClampToCenteredSize(image_bounds.size());
+      image_to_draw = gfx::ImageSkiaOperations::ExtractSubset(resized_image_,
+                                                              preferred_size);
+      break;
+  }
+
+  canvas->DrawImageInPath(image_to_draw, image_bounds.x(), image_bounds.y(),
                           path, flags);
 }
 

ash/public/cpp/rounded_image_view.h

@@ -16,9 +16,18 @@ namespace ash {
 // A custom image view with rounded edges.
 class ASH_PUBLIC_EXPORT RoundedImageView : public views::View {
  public:
+  enum class Alignment {
+    // The image's drawn portion always contains the image's origin.
+    kLeading,
+
+    // If the image's size is greater than the view's, only the portion around
+    // the image's center shows.
+    kCenter
+  };
+
   // Constructs a new rounded image view with rounded corners of radius
   // |corner_radius|.
-  explicit RoundedImageView(int corner_radius);
+  RoundedImageView(int corner_radius, Alignment alignment);
   ~RoundedImageView() override;
 
   // Set the image that should be displayed. The image contents is copied to the
@@ -49,6 +58,8 @@ class ASH_PUBLIC_EXPORT RoundedImageView : public views::View {
   gfx::ImageSkia resized_image_;
   int corner_radius_[4];
 
+  const Alignment alignment_;
+
   DISALLOW_COPY_AND_ASSIGN(RoundedImageView);
 };
 

ash/system/holding_space/holding_space_item_chip_view.cc

@@ -29,8 +29,8 @@ HoldingSpaceItemChipView::HoldingSpaceItemChipView(
 
   SetPreferredSize(gfx::Size(kHoldingSpaceChipWidth, kHoldingSpaceChipHeight));
 
-  image_ = AddChildView(
-      std::make_unique<RoundedImageView>(kHoldingSpaceChipIconSize / 2));
+  image_ = AddChildView(std::make_unique<RoundedImageView>(
+      kHoldingSpaceChipIconSize / 2, RoundedImageView::Alignment::kLeading));
 
   label_ = AddChildView(std::make_unique<views::Label>(item->text()));
   label_->SetElideBehavior(gfx::ELIDE_MIDDLE);

ash/system/holding_space/holding_space_item_screenshot_view.cc

@@ -23,8 +23,8 @@ HoldingSpaceItemScreenshotView::HoldingSpaceItemScreenshotView(
   SetPreferredSize(kHoldingSpaceScreenshotSize);
   SetLayoutManager(std::make_unique<views::FillLayout>());
 
-  image_ = AddChildView(
-      std::make_unique<RoundedImageView>(kHoldingSpaceCornerRadius));
+  image_ = AddChildView(std::make_unique<RoundedImageView>(
+      kHoldingSpaceCornerRadius, RoundedImageView::Alignment::kLeading));
 
   // Subscribe to be notified of changes to `item_`'s image.
   image_subscription_ = item->image().AddImageSkiaChangedCallback(

ash/system/unified/user_chooser_view.cc

@@ -159,7 +159,8 @@ views::View* CreateUserAvatarView(int user_index) {
     return new TopShortcutButton(kSystemMenuGuestIcon,
                                  IDS_ASH_STATUS_TRAY_GUEST_LABEL);
   } else {
-    auto* image_view = new RoundedImageView(kTrayItemSize / 2);
+    auto* image_view = new RoundedImageView(
+        kTrayItemSize / 2, RoundedImageView::Alignment::kLeading);
     image_view->SetCanProcessEventsWithinSubtree(false);
     image_view->SetImage(user_session->user_info.avatar.image,
                          gfx::Size(kTrayItemSize, kTrayItemSize));