ui/views/controls/menu/menu_delegate.cc - Issue 10546104: Make IsTriggerableEvent take Event objects and use it to verify whether tap events should trigger.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/menu/menu_delegate.cc

Issue 10546104: Make IsTriggerableEvent take Event objects and use it to verify whether tap events should trigger. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pass Event to ShouldEnterPushedState. Created 8 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/menu/menu_delegate.cc

diff --git a/ui/views/controls/menu/menu_delegate.cc b/ui/views/controls/menu/menu_delegate.cc

index 0663659057ef478b4785b75b293dfe1b3177063d..e384d251109f2e038b33a94d52abfdc52f004fc0 100644

--- a/ui/views/controls/menu/menu_delegate.cc

+++ b/ui/views/controls/menu/menu_delegate.cc

@@ -58,8 +58,11 @@ void MenuDelegate::ExecuteCommand(int id, int mouse_event_flags) {

}

bool MenuDelegate::IsTriggerableEvent(MenuItemView* source,

- const MouseEvent& e) {

- return e.IsLeftMouseButton() || e.IsRightMouseButton();

+ const Event& e) {

+ return e.type() == ui::ET_GESTURE_TAP ||

+ e.type() == ui::ET_GESTURE_TAP_DOWN ||

+ (e.IsMouseEvent() && (e.flags() &

+ (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON)));

}

bool MenuDelegate::CanDrop(MenuItemView* menu, const OSExchangeData& data) {

« no previous file with comments | « ui/views/controls/menu/menu_delegate.h ('k') | ui/views/controls/menu/menu_model_adapter.h » ('j') | no next file with comments »