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

Unified Diff: ash/shelf/shelf_button.cc

Issue 2042073002: Centered flood fill style ink drop ripples on mouse/touch points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed LocatedEvent::AsLocatedIfLocatedEvent() as FromIfValid(). Created 4 years, 6 months 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 | « ash/shelf/shelf_button.h ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_button.cc
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc
index 0f5d112c0e32b15f1d9895984aa45c1f98d86ce3..41f0f3df6b7af7be295425cff02ad2c101e7891c 100644
--- a/ash/shelf/shelf_button.cc
+++ b/ash/shelf/shelf_button.cc
@@ -345,8 +345,8 @@ gfx::Rect ShelfButton::GetIconBounds() const {
return icon_view_->bounds();
}
-void ShelfButton::OnDragStarted() {
- AnimateInkDrop(views::InkDropState::HIDDEN);
+void ShelfButton::OnDragStarted(const ui::LocatedEvent* event) {
+ AnimateInkDrop(views::InkDropState::HIDDEN, event);
}
void ShelfButton::ShowContextMenu(const gfx::Point& p,
@@ -503,7 +503,8 @@ std::unique_ptr<views::InkDropRipple> ShelfButton::CreateInkDropRipple() const {
gfx::Size(kInkDropLargeSize, kInkDropLargeSize),
kInkDropLargeCornerRadius,
gfx::Size(kInkDropSmallSize, kInkDropSmallSize),
- kInkDropSmallCornerRadius, GetInkDropCenter(), GetInkDropBaseColor()));
+ kInkDropSmallCornerRadius, GetLocalBounds().CenterPoint(),
+ GetInkDropBaseColor()));
}
bool ShelfButton::ShouldEnterPushedState(const ui::Event& event) {
« no previous file with comments | « ash/shelf/shelf_button.h ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698