Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Unified Diff: ui/app_list/pagination_model.cc

Issue 10961020: cros: Fix mouse over-scroll animation not happening. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix jumping around when mouse is hovering on an item Created 8 years, 3 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
« no previous file with comments | « ui/app_list/pagination_model.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/pagination_model.cc
diff --git a/ui/app_list/pagination_model.cc b/ui/app_list/pagination_model.cc
index e05896c4eb0cc6e525771ae4a8258535060a14d0..12ebbb7af78126de3aff2cd033a4faed9bb9de58 100644
--- a/ui/app_list/pagination_model.cc
+++ b/ui/app_list/pagination_model.cc
@@ -15,7 +15,6 @@ PaginationModel::PaginationModel()
: total_pages_(-1),
selected_page_(-1),
transition_(-1, 0),
- scrolling_(false),
pending_selected_page_(-1),
transition_duration_ms_(0) {
}
@@ -101,7 +100,6 @@ void PaginationModel::SetTransitionDuration(int duration_ms) {
}
void PaginationModel::StartScroll() {
- scrolling_ = true;
// Cancels current transition animation (if any).
transition_animation_.reset();
}
@@ -133,8 +131,6 @@ void PaginationModel::UpdateScroll(double delta) {
}
void PaginationModel::EndScroll(bool cancel) {
- scrolling_ = false;
-
if (!has_transition())
return;
@@ -147,6 +143,10 @@ void PaginationModel::EndScroll(bool cancel) {
transition_animation_->Hide();
}
+bool PaginationModel::IsRevertingCurrentTransition() const {
+ return transition_animation_.get() && transition_animation_->IsClosing();
+}
+
void PaginationModel::AddObserver(PaginationModelObserver* observer) {
observers_.AddObserver(observer);
}
« no previous file with comments | « ui/app_list/pagination_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698