ui/app_list/contents_view.cc - Issue 10826209: gestures: Generate only either scroll-end or fling-start events at the end of a scroll gesture.

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/app_list/contents_view.cc

Issue 10826209: gestures: Generate only either scroll-end or fling-start events at the end of a scroll gesture. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: win-fix Created 8 years, 4 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

« content/browser/renderer_host/render_widget_host_view_win.cc ('K') | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | ui/app_list/pagination_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/app_list/contents_view.cc

diff --git a/ui/app_list/contents_view.cc b/ui/app_list/contents_view.cc

index 4b4bc77d1ab650f010faee05a53127c18847d68d..2ad98879a2c80538ac7cd49f6ddcf92db86d0403 100644

--- a/ui/app_list/contents_view.cc

+++ b/ui/app_list/contents_view.cc

@@ -204,13 +204,14 @@ ui::GestureStatus ContentsView::OnGestureEvent(

pagination_model_->EndScroll();

return ui::GESTURE_STATUS_CONSUMED;

case ui::ET_SCROLL_FLING_START: {

+ pagination_model_->EndScroll();

if (fabs(event.details().velocity_x()) > kMinHorizVelocityToSwitchPage) {

+ pagination_model_->ResetTransitionAnimation();

pagination_model_->SelectPageRelative(

event.details().velocity_x() < 0 ? 1 : -1,

true);

- return ui::GESTURE_STATUS_CONSUMED;

}

- break;

+ return ui::GESTURE_STATUS_CONSUMED;

}

default:

break;