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

Unified Diff: ui/views/controls/button/menu_button.cc

Issue 1409183003: Adds ripple animation to extension buttons on a toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds ripple animation to extension buttons on a toolbar (fix for bug 546683) Created 5 years, 1 month 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
Index: ui/views/controls/button/menu_button.cc
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index 5603548ba337ab554a5e288b4a3ec353172c7297..1225e67f5057482bc8db59bf65543a12a7f14603 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -145,6 +145,12 @@ bool MenuButton::Activate() {
return true;
}
+void MenuButton::WillNotActivate() {
+ if (listener_) {
+ listener_->OnMenuButtonClickCanceled(this);
sadrul 2015/11/18 22:56:31 no {} for this
varkha 2015/11/18 23:27:54 This is inlined in OnMouseReleased (see https://co
+ }
+}
+
void MenuButton::OnPaint(gfx::Canvas* canvas) {
LabelButton::OnPaint(canvas);
@@ -189,6 +195,7 @@ void MenuButton::OnMouseReleased(const ui::MouseEvent& event) {
HitTestPoint(event.location()) && !InDrag()) {
Activate();
} else {
+ WillNotActivate();
sadrul 2015/11/18 22:56:31 Can this directly call into listener_->OnMenuButto
varkha 2015/11/18 23:27:54 Done in https://codereview.chromium.org/1411833006
LabelButton::OnMouseReleased(event);
}
}

Powered by Google App Engine
This is Rietveld 408576698