Centered flood fill style ink drop ripples on mouse/touch points.

ui/views/controls/button/label_button.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/controls/button/label_button.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
+#include "ui/views/animation/square_ink_drop_ripple.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace {
 
 // The default spacing between the icon and text.
 const int kSpacing = 5;
@@ skipping 398 matching lines @@
   ink_drop_container_->layer()->Add(ink_drop_layer);
 }
 
 void LabelButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   image()->SetPaintToLayer(false);
   ink_drop_container_->layer()->Remove(ink_drop_layer);
   ink_drop_container_->SetVisible(false);
 }
 
 std::unique_ptr<views::InkDropRipple> LabelButton::CreateInkDropRipple() const {
-  return GetText().empty() ? CustomButton::CreateInkDropRipple()
-                           : base::WrapUnique(new views::FloodFillInkDropRipple(
-                                 GetLocalBounds(), GetInkDropCenter(),
-                                 GetInkDropBaseColor()));
+  return GetText().empty()
+             ? CreateDefaultInkDropRipple(

[Evan Stade, 2016/06/14 21:13:24]

if you make this InkDropHostView::CreateInkDropRipple then I think you can make
CreateDefaultInkDropRipple private

(actually I don't know why this has to change from
CustomButton::CreateInkDropRipple in the first place)

[bruthig, 2016/06/14 21:57:01]

The center point is different, CustomButton::CreateInkDropRipple() puts the
centerpoint at the local bounds center whereas this puts the center behind the
image i.e. 'image()->GetMirroredBounds()'. this is needed because the 'Back'
button and AppMenuButtons extend their bounds and aren't square when the Window
is maximized.

[Evan Stade, 2016/06/15 18:14:09]

ah I see that this logic used to be in GetInkDropCenter. Why didn't you change
InkDropHostView::GetInkDropCenter() to return based on the last event? Instead
you added a new method.

[bruthig, 2016/06/15 18:52:02]

Because the buttons using the SquareInkDropRipple shouldn't be centered on the
last event and currently the SquareInkDropRipple is the default one created by
InkDropHostView.

+                   image()->GetMirroredBounds().CenterPoint())
+             : std::unique_ptr<views::InkDropRipple>(
+                   new views::FloodFillInkDropRipple(
+                       GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
+                       GetInkDropBaseColor()));
 }
 
 std::unique_ptr<views::InkDropHighlight> LabelButton::CreateInkDropHighlight()
     const {
   if (!ShouldShowInkDropHighlight())
     return nullptr;
-  return GetText().empty() ? CustomButton::CreateInkDropHighlight()
-                           : base::WrapUnique(new views::InkDropHighlight(
-                                 size(), kInkDropSmallCornerRadius,
-                                 GetInkDropCenter(), GetInkDropBaseColor()));
-}
-
-gfx::Point LabelButton::GetInkDropCenter() const {
-  // TODO(bruthig): Make the flood fill ink drops centered on the LocatedEvent
-  // that triggered them.
-  return GetText().empty() ? image()->GetMirroredBounds().CenterPoint()
-                           : CustomButton::GetInkDropCenter();
+  return GetText().empty()
+             ? CreateDefaultInkDropHighlight(
+                   image()->GetMirroredBounds().CenterPoint())
+             : base::WrapUnique(new views::InkDropHighlight(
+                   size(), kInkDropSmallCornerRadius,
+                   GetLocalBounds().CenterPoint(), GetInkDropBaseColor()));
 }
 
 void LabelButton::StateChanged() {
   const gfx::Size previous_image_size(image_->GetPreferredSize());
   UpdateImage();
   ResetLabelEnabledColor();
   label_->SetEnabled(state() != STATE_DISABLED);
   if (image_->GetPreferredSize() != previous_image_size)
     Layout();
 }
@@ skipping 117 matching lines @@
 void LabelButton::ResetLabelEnabledColor() {
   const SkColor color =
       explicitly_set_colors_[state()]
           ? button_state_colors_[state()]
           : PlatformStyle::TextColorForButton(button_state_colors_, *this);
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
 }
 
 }  // namespace views