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

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

Issue 889593003: Animate the app list search box shadow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_animations
Patch Set: move GetShadowForZHeight to app_list_constants.cc Created 5 years, 10 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
« no previous file with comments | « ui/app_list/app_list_constants.h ('k') | ui/app_list/views/contents_animator.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_constants.h" 5 #include "ui/app_list/app_list_constants.h"
6 6
7 namespace app_list { 7 namespace app_list {
8 8
9 const SkColor kContentsBackgroundColor = SkColorSetRGB(0xF5, 0xF5, 0xF5); 9 const SkColor kContentsBackgroundColor = SkColorSetRGB(0xF5, 0xF5, 0xF5);
10 const SkColor kSearchBoxBackground = SK_ColorWHITE; 10 const SkColor kSearchBoxBackground = SK_ColorWHITE;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 const SkColor kFolderTitleColor = SkColorSetRGB(0x33, 0x33, 0x33); 43 const SkColor kFolderTitleColor = SkColorSetRGB(0x33, 0x33, 0x33);
44 const SkColor kFolderTitleHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0); 44 const SkColor kFolderTitleHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
45 // Color of the folder ink bubble. 45 // Color of the folder ink bubble.
46 const SkColor kFolderBubbleColor = SK_ColorWHITE; 46 const SkColor kFolderBubbleColor = SK_ColorWHITE;
47 // Color of the folder bubble shadow. 47 // Color of the folder bubble shadow.
48 const SkColor kFolderShadowColor = SkColorSetRGB(0xBF, 0xBF, 0xBF); 48 const SkColor kFolderShadowColor = SkColorSetRGB(0xBF, 0xBF, 0xBF);
49 const float kFolderBubbleRadius = 23; 49 const float kFolderBubbleRadius = 23;
50 const float kFolderShadowRadius = 23.5; 50 const float kFolderShadowRadius = 23.5;
51 const float kFolderShadowOffsetY = 1; 51 const float kFolderShadowOffsetY = 1;
52 52
53 const int kCardShadowBlur = 4;
54 const int kCardShadowYOffset = 1;
55 const SkColor kCardShadowColor = SkColorSetARGB(0x4C, 0, 0, 0);
56 const SkColor kCardBackgroundColor = SK_ColorWHITE; 53 const SkColor kCardBackgroundColor = SK_ColorWHITE;
57 54
58 // Duration in milliseconds for page transition. 55 // Duration in milliseconds for page transition.
59 const int kPageTransitionDurationInMs = 180; 56 const int kPageTransitionDurationInMs = 180;
60 57
61 // Duration in milliseconds for over scroll page transition. 58 // Duration in milliseconds for over scroll page transition.
62 const int kOverscrollPageTransitionDurationMs = 50; 59 const int kOverscrollPageTransitionDurationMs = 50;
63 60
64 // Duration in milliseconds for fading in the target page when opening 61 // Duration in milliseconds for fading in the target page when opening
65 // or closing a folder, and the duration for the top folder icon animation 62 // or closing a folder, and the duration for the top folder icon animation
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ui::ResourceBundle::SmallBoldFont; 116 ui::ResourceBundle::SmallBoldFont;
120 117
121 #if defined(OS_LINUX) 118 #if defined(OS_LINUX)
122 #if defined(GOOGLE_CHROME_BUILD) 119 #if defined(GOOGLE_CHROME_BUILD)
123 const char kAppListWMClass[] = "chrome_app_list"; 120 const char kAppListWMClass[] = "chrome_app_list";
124 #else // CHROMIUM_BUILD 121 #else // CHROMIUM_BUILD
125 const char kAppListWMClass[] = "chromium_app_list"; 122 const char kAppListWMClass[] = "chromium_app_list";
126 #endif 123 #endif
127 #endif 124 #endif
128 125
126 gfx::ShadowValue GetShadowForZHeight(int z_height) {
127 if (z_height <= 0)
128 return gfx::ShadowValue();
129
130 switch (z_height) {
131 case 1:
132 return gfx::ShadowValue(gfx::Point(0, 1), 2,
133 SkColorSetARGB(0x4C, 0, 0, 0));
134 case 2:
135 return gfx::ShadowValue(gfx::Point(0, 2), 4,
136 SkColorSetARGB(0x33, 0, 0, 0));
137 default:
138 return gfx::ShadowValue(gfx::Point(0, 8), 12,
139 SkColorSetARGB(0x3F, 0, 0, 0));
140 }
141 }
142
129 } // namespace app_list 143 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/app_list_constants.h ('k') | ui/app_list/views/contents_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698