Made material design ink drop QUICK_ACTION animation more visible.

chrome/browser/ui/views/toolbar/toolbar_button.cc

 // Copyright 2013 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/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 16 matching lines @@
 #include "ui/views/widget/widget.h"
 
 ToolbarButton::ToolbarButton(views::ButtonListener* listener,
                              ui::MenuModel* model)
     : views::LabelButton(listener, base::string16()),
       model_(model),
       menu_showing_(false),
       y_position_on_lbuttondown_(0),
       ink_drop_animation_controller_(
           views::InkDropAnimationControllerFactory::
-              CreateInkDropAnimationController(this)),
+              CreateInkDropAnimationController(this, this)),
       show_menu_factory_(this) {
   set_context_menu_controller(this);
 
   const int kInkDropLargeSize = 32;
   const int kInkDropLargeCornerRadius = 5;
   const int kInkDropSmallSize = 24;
   const int kInkDropSmallCornerRadius = 2;
 
   ink_drop_animation_controller_->SetInkDropSize(
       gfx::Size(kInkDropLargeSize, kInkDropLargeSize),
@@ skipping 96 matching lines @@
   if (IsTriggerableEvent(event))
     show_menu_factory_.InvalidateWeakPtrs();
 
   if (!HitTestPoint(event.location()))
     ink_drop_animation_controller_->AnimateToState(views::InkDropState::HIDDEN);
 }
 
 void ToolbarButton::OnMouseCaptureLost() {
 }
 
+void ToolbarButton::OnMouseEntered(const ui::MouseEvent& event) {
+  UpdateInkDropHoverState();
+}
+
 void ToolbarButton::OnMouseExited(const ui::MouseEvent& event) {
+  UpdateInkDropHoverState();

[Peter Kasting, 2015/11/11 21:41:38]

Nit: It might be better to do this below the SetState() call, just in case any
future code ever wants to make the ink drop state depend on the current button
state.

+
   // Starting a drag results in a MouseExited, we need to ignore it.
   // A right click release triggers an exit event. We want to
   // remain in a PUSHED state until the drop down menu closes.
   if (state_ != STATE_DISABLED && !InDrag() && state_ != STATE_PRESSED)
     SetState(STATE_NORMAL);
 }
 
 void ToolbarButton::OnGestureEvent(ui::GestureEvent* event) {
   if (menu_showing_) {
     // While dropdown menu is showing the button should not handle gestures.
     event->StopPropagation();
     return;
   }
 
   LabelButton::OnGestureEvent(event);
 
   views::InkDropState ink_drop_state = views::InkDropState::HIDDEN;
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
       ink_drop_state = views::InkDropState::ACTION_PENDING;
       // The ui::ET_GESTURE_TAP_DOWN event needs to be marked as handled so that
       // subsequent events for the gesture are sent to |this|.
       event->SetHandled();
       break;
     case ui::ET_GESTURE_LONG_PRESS:
       ink_drop_state = views::InkDropState::SLOW_ACTION_PENDING;
       break;
-    case ui::ET_GESTURE_TAP:
-      ink_drop_state = views::InkDropState::QUICK_ACTION;
-      break;
     case ui::ET_GESTURE_LONG_TAP:
       ink_drop_state = views::InkDropState::SLOW_ACTION;
       break;
+    case ui::ET_GESTURE_SCROLL_BEGIN:
     case ui::ET_GESTURE_END:
-    case ui::ET_GESTURE_TAP_CANCEL:
       ink_drop_state = views::InkDropState::HIDDEN;
       break;
     default:
       return;
   }
+
+  if (ink_drop_state == views::InkDropState::HIDDEN &&
+      ink_drop_animation_controller_->WillAutoAnimateToHidden()) {
+    // Some InkDropStates automatically transition to the HIDDEN state so we
+    // don't make an explicit call. Explicitly animating to HIDDEN in this case
+    // would prematurely pre-empt these animations.

[Peter Kasting, 2015/11/11 21:41:38]

Nit: I'd move this comment above the conditional, reverse the conditional, and
put the AnimateToState() call inside it.

+    return;
+  }
   ink_drop_animation_controller_->AnimateToState(ink_drop_state);
 }
 
 void ToolbarButton::GetAccessibleState(ui::AXViewState* state) {
   CustomButton::GetAccessibleState(state);
   state->role = ui::AX_ROLE_BUTTON_DROP_DOWN;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
   state->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
 scoped_ptr<views::LabelButtonBorder>
 ToolbarButton::CreateDefaultBorder() const {
   scoped_ptr<views::LabelButtonBorder> border =
       views::LabelButton::CreateDefaultBorder();
 
   ui::ThemeProvider* provider = GetThemeProvider();
   if (provider && provider->UsingSystemTheme())
     border->set_insets(GetLayoutInsets(TOOLBAR_BUTTON));
 
   return border.Pass();
 }
 
+void ToolbarButton::OnEnabledChanged() {
+  UpdateInkDropHoverState();
+}
+
 void ToolbarButton::ShowContextMenuForView(View* source,
                                            const gfx::Point& point,
                                            ui::MenuSourceType source_type) {
   if (!enabled())
     return;
 
   show_menu_factory_.InvalidateWeakPtrs();
   ShowDropDownMenu(source_type);
 }
 
@@ skipping 112 matching lines @@
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 gfx::Point ToolbarButton::CalculateInkDropCenter() const {
   return GetLocalBounds().CenterPoint();
 }
 
+void ToolbarButton::UpdateInkDropHoverState() {
+  ink_drop_animation_controller_->SetHovered(ShouldShowInkDropHover());
+}
+
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }