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

Side by Side Diff: ui/app_list/app_list_item_view.cc

Issue 10890049: app_list: Touch scroll and animation improvement. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/app_list/app_list_item_view.h ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/app_list/app_list_item_view.h" 5 #include "ui/app_list/app_list_item_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 if (state() == BS_HOT || state() == BS_PUSHED) { 299 if (state() == BS_HOT || state() == BS_PUSHED) {
300 apps_grid_view_->SetSelectedItem(this); 300 apps_grid_view_->SetSelectedItem(this);
301 title_->SetEnabledColor(kTitleHoverColor); 301 title_->SetEnabledColor(kTitleHoverColor);
302 } else { 302 } else {
303 apps_grid_view_->ClearSelectedItem(this); 303 apps_grid_view_->ClearSelectedItem(this);
304 model_->SetHighlighted(false); 304 model_->SetHighlighted(false);
305 title_->SetEnabledColor(kTitleColor); 305 title_->SetEnabledColor(kTitleColor);
306 } 306 }
307 } 307 }
308 308
309 bool AppListItemView::ShouldEnterPushedState(const ui::Event& event) {
310 // Don't enter pushed state for ET_GESTURE_TAP_DOWN so that hover gray
311 // background does not show up during scroll.
312 if (event.type() == ui::ET_GESTURE_TAP_DOWN)
313 return false;
314
315 return views::CustomButton::ShouldEnterPushedState(event);
316 }
317
309 } // namespace app_list 318 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/app_list_item_view.h ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698