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

Unified Diff: ui/app_list/views/app_list_item_view.cc

Issue 140203003: Implement animation UI for opening/closing an app list folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address code review comments. Created 6 years, 11 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/views/app_list_item_view.h ('k') | ui/app_list/views/apps_container_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_item_view.cc
diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc
index ff756cc2611eb5dab84acd033b832571af23d937..54eda7d62cb146bd2b46de6d5d2f45d6a2173db7 100644
--- a/ui/app_list/views/app_list_item_view.cc
+++ b/ui/app_list/views/app_list_item_view.cc
@@ -47,7 +47,7 @@ const int kLeftRightPaddingChars = 1;
const float kDraggingIconScale = 1.5f;
// Delay in milliseconds of when the dragging UI should be shown for mouse drag.
-const int kMouseDragUIDelayInMs = 100;
+const int kMouseDragUIDelayInMs = 200;
} // namespace
@@ -127,7 +127,7 @@ void AppListItemView::UpdateIcon() {
icon_shadows_));
icon_->SetImage(shadow);
return;
- };
+ }
icon_->SetImage(resized);
}
@@ -269,7 +269,6 @@ void AppListItemView::Layout() {
gfx::Rect icon_bounds(rect.x(), y, rect.width(), icon_size_.height());
icon_bounds.Inset(gfx::ShadowValue::GetMargin(icon_shadows_));
icon_->SetBoundsRect(icon_bounds);
-
const gfx::Size title_size = title_->GetPreferredSize();
gfx::Rect title_bounds(rect.x() + (rect.width() - title_size.width()) / 2,
y + icon_size_.height() + kIconTitleSpacing,
@@ -463,4 +462,8 @@ void AppListItemView::OnSyncDragEnd() {
SetUIState(UI_STATE_NORMAL);
}
+const gfx::Rect& AppListItemView::GetIconBounds() const {
+ return icon_->bounds();
+}
+
} // namespace app_list
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/apps_container_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698