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 156480c5f08b0f2013d072e7b8d3212373e49de4..c16b6693b5314cd35987cd46018dec0151ebf6d3 100644 |
--- a/ui/views/controls/button/menu_button.cc |
+++ b/ui/views/controls/button/menu_button.cc |
@@ -9,6 +9,7 @@ |
#include "grit/ui_strings.h" |
#include "ui/base/accessibility/accessible_view_state.h" |
#include "ui/base/dragdrop/drag_drop_types.h" |
+#include "ui/base/events.h" |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/gfx/canvas.h" |
@@ -237,6 +238,14 @@ bool MenuButton::OnKeyPressed(const KeyEvent& event) { |
return false; |
} |
+ui::GestureStatus MenuButton::OnGestureEvent(const GestureEvent& event) { |
sadrul
2012/06/11 16:00:37
This should be before OnKeyPressed (order in cc fi
flackr
2012/06/11 19:34:45
Done.
|
+ if (state() != BS_DISABLED && event.type() == ui::ET_GESTURE_TAP) { |
+ if (Activate()) |
+ return ui::GESTURE_STATUS_CONSUMED; |
+ } |
+ return TextButton::OnGestureEvent(event); |
+} |
+ |
bool MenuButton::OnKeyReleased(const KeyEvent& event) { |
// Override CustomButton's implementation, which presses the button when |
// you press space and clicks it when you release space. For a MenuButton |