Index: ui/views/controls/button/custom_button.cc |
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc |
index 85dc33627b1d853aebe03296affa86e9b96f3618..6461e8d16ac00b2c88ed4330b343b8e324103b41 100644 |
--- a/ui/views/controls/button/custom_button.cc |
+++ b/ui/views/controls/button/custom_button.cc |
@@ -470,8 +470,10 @@ void CustomButton::NotifyClick(const ui::Event& event) { |
} |
void CustomButton::OnClickCanceled(const ui::Event& event) { |
- AnimateInkDrop(views::InkDropState::HIDDEN, |
- ui::LocatedEvent::FromIfValid(&event)); |
+ if (ink_drop()->GetTargetInkDropState() != views::InkDropState::ACTIVATED) { |
bruthig
2016/07/26 21:24:27
I think I'd feel better if this were configurable
mohsen
2016/08/17 05:31:35
I changed the code such that OnClickCanceled() is
|
+ AnimateInkDrop(views::InkDropState::HIDDEN, |
+ ui::LocatedEvent::FromIfValid(&event)); |
+ } |
Button::OnClickCanceled(event); |
} |