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

Unified Diff: ui/views/controls/combobox/combobox.cc

Issue 2070623003: [MacViews] Show combobox menu popup at mouse press (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit 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
Index: ui/views/controls/combobox/combobox.cc
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index 3d7cfd1e26585dae22ab9fd8f8cfe5d876987304..787a72504974e92bd59feb47ad8cc6bb4873f368 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -110,13 +110,19 @@ class TransparentButton : public CustomButton {
: CustomButton(listener) {
SetAnimationDuration(LabelButton::kHoverAnimationDurationMs);
SetFocusBehavior(FocusBehavior::NEVER);
+ set_notify_action(PlatformStyle::kMenuActivationAction);
}
~TransparentButton() override {}
+#if defined(OS_MACOSX)
+ // Override OnMousePressed() to transfer focus on the parent() on a click
tapted 2016/06/29 12:02:55 "on the parent() on a click" -> "to the parent() o
spqchan 2016/06/29 18:29:14 Done.
+ // on Mac, which doesn't transfer focus when buttons are clicked.
bool OnMousePressed(const ui::MouseEvent& mouse_event) override {
parent()->RequestFocus();
+ CustomButton::OnMousePressed(mouse_event);
tapted 2016/06/29 12:02:55 nit: remove this bit (although I think it's fine,
spqchan 2016/06/29 18:29:14 We need this actually because CustomButton::MouseP
tapted 2016/06/29 23:24:43 Ah! So, I think we can remove this once the #ifdef
return true;
}
+#endif
double GetAnimationValue() const {
return hover_animation().GetCurrentValue();
« no previous file with comments | « no previous file | ui/views/controls/combobox/combobox_unittest.cc » ('j') | ui/views/controls/combobox/combobox_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698