ui/views/controls/button/custom_button.cc - Issue 1437523005: Custom buttons should only handle accelerators when focused.

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/button/custom_button.cc

Issue 1437523005: Custom buttons should only handle accelerators when focused. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: msw comments Created 5 years, 1 month 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/button/custom_button.cc

diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc

index 61b595bbfeb2f059327527ad3c1ef18e76afb270..056a83764473bc248edb80a6f0b7b5d9482404ed 100644

--- a/ui/views/controls/button/custom_button.cc

+++ b/ui/views/controls/button/custom_button.cc

@@ -251,6 +251,8 @@ void CustomButton::OnGestureEvent(ui::GestureEvent* event) {

}

bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {

+ if (GetWidget() && !GetWidget()->IsActive())

+ return false;

SetState(STATE_NORMAL);

// TODO(beng): remove once NotifyClick takes ui::Event.

ui::MouseEvent synthetic_event(

« no previous file with comments | « no previous file | ui/views/controls/button/custom_button_unittest.cc » ('j') | ui/views/controls/button/custom_button_unittest.cc » ('J')