Commit a107ca18 authored by Weidong Guo's avatar Weidong Guo Committed by Commit Bot

Fix mouse scroll issue in folder

Changes:
Make apps grid view in folder handles all scroll event if folder is
opened to avoid closing app launcher via scrolling up in 1st page of
folder.

Bug: 847800
Change-Id: I5ec3744686202d519b421044d810857a3a5020d5
Reviewed-on: https://chromium-review.googlesource.com/1088148
Commit-Queue: Weidong Guo <weidongg@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565052}
parent a81ee326
......@@ -1759,9 +1759,11 @@ void AppsGridView::UpdateOpacity() {
}
bool AppsGridView::HandleScrollFromAppListView(int offset, ui::EventType type) {
// Scroll up at first page should close the launcher.
if (offset > 0 && !pagination_model()->IsValidPageRelative(-1))
// Scroll up at first page in top level apps grid should close the launcher.
if (!folder_delegate_ && offset > 0 &&
!pagination_model()->IsValidPageRelative(-1)) {
return false;
}
HandleScroll(offset, type);
return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment