ash/shelf/app_list_button.cc - Issue 2127723003: [MD settings] do not scroll when toggling advanced menu

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: ash/shelf/app_list_button.cc

Issue 2127723003: [MD settings] do not scroll when toggling advanced menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge with master Created 4 years, 5 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: ash/shelf/app_list_button.cc

diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc

index cbef0f4cf36c92393f5913e6ecbb39e28968dba4..b93bb879f10b8772c17024a390e88bf33a3c0519 100644

--- a/ash/shelf/app_list_button.cc

+++ b/ash/shelf/app_list_button.cc

@@ -267,7 +267,11 @@ void AppListButton::NotifyClick(const ui::Event& event) {

}

bool AppListButton::ShouldEnterPushedState(const ui::Event& event) {

- return !Shell::GetInstance()->IsApplistVisible();

+ if (!shelf_view_->ShouldEventActivateButton(this, event))

+ return false;

+ if (Shell::GetInstance()->IsApplistVisible())

+ return false;

+ return views::ImageButton::ShouldEnterPushedState(event);

Dan Beam 2016/07/08 23:32:28 wat

dschuyler 2016/07/20 19:03:01 Done.

}

bool AppListButton::ShouldShowInkDropHighlight() const {

« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_main/settings_main.js » ('j') | no next file with comments »