ui/views/controls/menu/menu_model_adapter.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_model_adapter.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_model_adapter.cc

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

index 583c74a1098da982643c8065fc5534fcf85ef8a4..97b326639047e7d1ee35e841ade2f0a96abae4e1 100644

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

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

@@ -75,8 +75,10 @@ void MenuModelAdapter::ExecuteCommand(int id, int mouse_event_flags) {

}

bool MenuModelAdapter::IsTriggerableEvent(MenuItemView* source,

- const MouseEvent& e) {

- return (triggerable_event_flags_ & e.flags()) != 0;

+ const Event& e) {

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

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

+ (e.IsMouseEvent() && (triggerable_event_flags_ & e.flags()) != 0);

}

bool MenuModelAdapter::GetAccelerator(int id,

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