[MD] some tweaks to download shelf

chrome/browser/ui/views/download/download_item_view_md.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 "chrome/browser/ui/views/download/download_item_view_md.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 39 matching lines @@
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/gfx/vector_icons_public.h"
+#include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::DownloadItem;
 using extensions::ExperienceSamplingEvent;
@@ skipping 15 matching lines @@
 // This is only used when the text size is large.
 const int kMinimumVerticalPadding = 2 + kTopBottomPadding;
 
 // Vertical padding between filename and status text.
 const int kVerticalTextPadding = 1;
 
 const int kTooltipMaxWidth = 800;
 
 // Padding before the icon and at end of the item.
 const int kStartPadding = 12;
-const int kEndPadding = 19;
+const int kEndPadding = 6;
 
 // Horizontal padding between progress indicator and filename/status text.
 const int kProgressTextPadding = 8;
 
 // The space between the Save and Discard buttons when prompting for a dangerous
 // download.
 const int kButtonPadding = 5;
 
-// The space on the left and right side of the dangerous download label.
+// The touchable space around the dropdown button's icon.
+const int kDropdownBorderWidth = 10;
+
+// The space on the right side of the dangerous download label.
 const int kLabelPadding = 8;
 
 // Height/width of the warning icon, also in dp.
 const int kWarningIconSize = 24;
 
 // How long the 'download complete' animation should last for.
 const int kCompleteAnimationDurationMs = 2500;
 
 // How long the 'download interrupted' animation should last for.
 const int kInterruptedAnimationDurationMs = 2500;
@@ skipping 45 matching lines @@
       dangerous_download_label_sized_(false),
       disabled_while_opening_(false),
       creation_time_(base::Time::Now()),
       time_download_warning_shown_(base::Time()),
       weak_ptr_factory_(this) {
   DCHECK(download());
   DCHECK(ui::MaterialDesignController::IsModeMaterial());
   download()->AddObserver(this);
   set_context_menu_controller(this);
 
+  dropdown_button_->SetBorder(
+      views::Border::CreateEmptyBorder(gfx::Insets(kDropdownBorderWidth)));
+  dropdown_button_->set_ink_drop_size(gfx::Size(32, 32));
   AddChildView(dropdown_button_);
 
   LoadIcon();
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   font_list_ =
       rb.GetFontList(ui::ResourceBundle::BaseFont).DeriveWithSizeDelta(1);
   status_font_list_ =
       rb.GetFontList(ui::ResourceBundle::BaseFont).DeriveWithSizeDelta(-2);
 
@@ skipping 130 matching lines @@
   shelf_->OpenedDownload();
 }
 
 // View overrides
 
 // In dangerous mode we have to layout our buttons.
 void DownloadItemViewMd::Layout() {
   UpdateColorsFromTheme();
 
   if (IsShowingWarningDialog()) {
-    int x = kStartPadding + kWarningIconSize + kStartPadding;
-    int y = (height() - dangerous_download_label_->height()) / 2;
-    dangerous_download_label_->SetBounds(x, y,
-                                         dangerous_download_label_->width(),
-                                         dangerous_download_label_->height());
+    gfx::Point child_origin(
+        kStartPadding + kWarningIconSize + kStartPadding,
+        (height() - dangerous_download_label_->height()) / 2);
+    dangerous_download_label_->SetPosition(child_origin);
+
+    child_origin.Offset(dangerous_download_label_->width() + kLabelPadding, 0);
     gfx::Size button_size = GetButtonSize();
-    x += dangerous_download_label_->width() + kLabelPadding;
-    y = (height() - button_size.height()) / 2;
+    child_origin.set_y((height() - button_size.height()) / 2);
     if (save_button_) {
-      save_button_->SetBounds(x, y, button_size.width(), button_size.height());
-      x += button_size.width() + kButtonPadding;
+      save_button_->SetBoundsRect(gfx::Rect(child_origin, button_size));
+      child_origin.Offset(button_size.width() + kButtonPadding, 0);
     }
-    discard_button_->SetBounds(x, y, button_size.width(), button_size.height());
+    discard_button_->SetBoundsRect(gfx::Rect(child_origin, button_size));
+    DCHECK_EQ(GetPreferredSize().width(),
+              discard_button_->bounds().right() + kEndPadding);
   } else {
     dropdown_button_->SizeToPreferredSize();
     dropdown_button_->SetPosition(
-        gfx::Point(width() - dropdown_button_->width(),
+        gfx::Point(width() - dropdown_button_->width() - kEndPadding,
                    (height() - dropdown_button_->height()) / 2));
   }
 }
 
 gfx::Size DownloadItemViewMd::GetPreferredSize() const {
-  int width, height;
-
-  // First, we set the height to the height of two rows or text plus margins.
-  height = std::max(kDefaultHeight,
-                    2 * kMinimumVerticalPadding + font_list_.GetBaseline() +
-                        kVerticalTextPadding + status_font_list_.GetHeight());
+  int width = 0;
+  // We set the height to the height of two rows or text plus margins.
+  int child_height = font_list_.GetBaseline() + kVerticalTextPadding +
+                     status_font_list_.GetHeight();
 
   if (IsShowingWarningDialog()) {
-    width = kStartPadding + kWarningIconSize + kLabelPadding +
+    // Width.
+    width = kStartPadding + kWarningIconSize + kStartPadding +
             dangerous_download_label_->width() + kLabelPadding;
     gfx::Size button_size = GetButtonSize();
-    // Make sure the button fits.
-    height = std::max<int>(height,
-                           2 * kMinimumVerticalPadding + button_size.height());
-    // Then we make sure the warning icon fits.
-    height = std::max<int>(
-        height, 2 * kMinimumVerticalPadding + kWarningIconSize);
     if (save_button_)
       width += button_size.width() + kButtonPadding;
     width += button_size.width() + kEndPadding;
+
+    // Height: make sure the button fits and the warning icon fits.
+    child_height =
+        std::max({child_height, button_size.height(), kWarningIconSize});
   } else {
     width = kStartPadding + DownloadShelf::kProgressIndicatorSize +
-            kProgressTextPadding + kTextWidth + kEndPadding;
+            kProgressTextPadding + kTextWidth +
+            dropdown_button_->GetPreferredSize().width() + kEndPadding;
   }
-  return gfx::Size(width, height);
+
+  return gfx::Size(width, std::max(kDefaultHeight,
+                                   2 * kMinimumVerticalPadding + child_height));
 }
 
 // Handle a mouse click and open the context menu if the mouse is
 // over the drop-down region.
 bool DownloadItemViewMd::OnMousePressed(const ui::MouseEvent& event) {
   HandlePressEvent(event, event.IsOnlyLeftMouseButton());
   return true;
 }
 
 // Handle drag (file copy) operations.
@@ skipping 431 matching lines @@
   // Avoid extra SchedulePaint()s if the state is going to be the same and
   // |dropdown_button_| has already been initialized.
   if (dropdown_state_ == new_state &&
       !dropdown_button_->GetImage(views::CustomButton::STATE_NORMAL).isNull())
     return;
 
   dropdown_button_->SetIcon(
       new_state == PUSHED ? gfx::VectorIconId::FIND_NEXT
                           : gfx::VectorIconId::FIND_PREV,
       base::Bind(&DownloadItemViewMd::GetTextColor, base::Unretained(this)));
+  dropdown_button_->ink_drop_delegate()->OnAction(
+      new_state == PUSHED ? views::InkDropState::ACTIVATED
+                          : views::InkDropState::DEACTIVATED);
   dropdown_button_->OnThemeChanged();
   dropdown_state_ = new_state;
   SchedulePaint();
 }
 
 void DownloadItemViewMd::ToggleWarningDialog() {
   if (model_.IsDangerous())
     ShowWarningDialog();
   else
     ClearWarningDialog();
@@ skipping 175 matching lines @@
     // If the width is growing again, it means we passed the optimal width spot.
     if (size.width() > min_width) {
       dangerous_download_label_->SetText(prev_text);
       break;
     } else {
       min_width = size.width();
     }
     prev_text = current_text;
   }
 
-  dangerous_download_label_->SetBounds(0, 0, size.width(), size.height());
+  dangerous_download_label_->SetSize(size);
   dangerous_download_label_sized_ = true;
 }
 
 void DownloadItemViewMd::Reenable() {
   disabled_while_opening_ = false;
   SetEnabled(true);  // Triggers a repaint.
 }
 
 void DownloadItemViewMd::ReleaseDropdown() {
   SetDropdownState(NORMAL);
@@ skipping 36 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemViewMd::GetTextColor() {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemViewMd::GetDimmedTextColor() {
   return SkColorSetA(GetTextColor(), 0xC7);
 }