diff options
| author | girard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 19:21:44 +0000 |
|---|---|---|
| committer | girard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 19:21:44 +0000 |
| commit | 815ee47fa0fdfb8fafe76b1e9ef5b478d588dc7a (patch) | |
| tree | 5928ddbe620faf8177073d243222bd706e514142 | |
| parent | fce44c1937c994e3b05a26a6d93331f804ac7d15 (diff) | |
| download | chromium_src-815ee47fa0fdfb8fafe76b1e9ef5b478d588dc7a.zip chromium_src-815ee47fa0fdfb8fafe76b1e9ef5b478d588dc7a.tar.gz chromium_src-815ee47fa0fdfb8fafe76b1e9ef5b478d588dc7a.tar.bz2 | |
Popup menu now ignores simulated right click event from windows touch event.
BUG=134058
TEST=
Review URL: https://chromiumcodereview.appspot.com/10796037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147502 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/views/controls/menu/menu_controller.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index 6cf1f43..0ca99f8 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -800,6 +800,12 @@ void MenuController::SetSelectionOnPointerDown(SubmenuView* source, if (part.is_scroll()) return; // Ignore presses on scroll buttons. + // When this menu is opened through a touch event, a simulated right-click + // is sent before the menu appears. Ignore it. + if ((event.flags() & ui::EF_RIGHT_MOUSE_BUTTON) && + (event.flags() & ui::EF_FROM_TOUCH)) + return; + if (part.type == MenuPart::NONE || (part.type == MenuPart::MENU_ITEM && part.menu && part.menu->GetRootMenuItem() != state_.item->GetRootMenuItem())) { |