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

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

Issue 1023983002: Fix background colour for Cocoa app list on hover (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actually just fix it Created 5 years, 9 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 | « no previous file | ui/app_list/cocoa/apps_search_results_controller.mm » ('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(0xF2, 0xF2, 0xF2); 9 const SkColor kContentsBackgroundColor = SkColorSetRGB(0xF2, 0xF2, 0xF2);
10 const SkColor kSearchBoxBackground = SK_ColorWHITE; 10 const SkColor kSearchBoxBackground = SK_ColorWHITE;
11 11
12 const SkColor kSearchTextColor = SkColorSetRGB(0x33, 0x33, 0x33); 12 const SkColor kSearchTextColor = SkColorSetRGB(0x33, 0x33, 0x33);
13 13
14 // In Windows, transparent background color will cause ugly text rendering, 14 // In Windows, transparent background color will cause ugly text rendering,
15 // therefore kContentsBackgroundColor should be used. See crbug.com/406989 15 // therefore kContentsBackgroundColor should be used. See crbug.com/406989
16 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
17 const SkColor kLabelBackgroundColor = SK_ColorTRANSPARENT; 17 const SkColor kLabelBackgroundColor = SK_ColorTRANSPARENT;
18 #else 18 #else
19 const SkColor kLabelBackgroundColor = kContentsBackgroundColor; 19 const SkColor kLabelBackgroundColor = kContentsBackgroundColor;
20 #endif 20 #endif
21 21
22 const SkColor kTopSeparatorColor = SkColorSetRGB(0xC0, 0xC0, 0xC0); 22 const SkColor kTopSeparatorColor = SkColorSetRGB(0xC0, 0xC0, 0xC0);
23 const SkColor kBottomSeparatorColor = SkColorSetRGB(0xC0, 0xC0, 0xC0); 23 const SkColor kBottomSeparatorColor = SkColorSetRGB(0xC0, 0xC0, 0xC0);
24 24
25 // The color of the separator used inside dialogs in the app list. 25 // The color of the separator used inside dialogs in the app list.
26 const SkColor kDialogSeparatorColor = SkColorSetRGB(0xD1, 0xD1, 0xD1); 26 const SkColor kDialogSeparatorColor = SkColorSetRGB(0xD1, 0xD1, 0xD1);
27 27
28 // Non-views Mac requires opaque colors to paint correctly.
29 #if defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS)
30 // The mouse hover colour (3% black over kContentsBackgroundColor).
31 const SkColor kHighlightedColor = SkColorSetRGB(0xEE, 0xEE, 0xEE);
32 // The keyboard select colour (6% black over kContentsBackgroundColor).
33 const SkColor kSelectedColor = SkColorSetRGB(0xE6, 0xE6, 0xE6);
34 #else
35 // The mouse hover colour (3% black). 28 // The mouse hover colour (3% black).
36 const SkColor kHighlightedColor = SkColorSetARGB(8, 0, 0, 0); 29 const SkColor kHighlightedColor = SkColorSetARGB(8, 0, 0, 0);
37 // The keyboard select colour (6% black). 30 // The keyboard select colour (6% black).
38 const SkColor kSelectedColor = SkColorSetARGB(15, 0, 0, 0); 31 const SkColor kSelectedColor = SkColorSetARGB(15, 0, 0, 0);
39 #endif
40 32
41 const SkColor kPagerHoverColor = SkColorSetRGB(0xB4, 0xB4, 0xB4); 33 const SkColor kPagerHoverColor = SkColorSetRGB(0xB4, 0xB4, 0xB4);
42 const SkColor kPagerNormalColor = SkColorSetRGB(0xE2, 0xE2, 0xE2); 34 const SkColor kPagerNormalColor = SkColorSetRGB(0xE2, 0xE2, 0xE2);
43 const SkColor kPagerSelectedColor = SkColorSetRGB(0x46, 0x8F, 0xFC); 35 const SkColor kPagerSelectedColor = SkColorSetRGB(0x46, 0x8F, 0xFC);
44 36
45 const SkColor kResultBorderColor = SkColorSetRGB(0xE5, 0xE5, 0xE5); 37 const SkColor kResultBorderColor = SkColorSetRGB(0xE5, 0xE5, 0xE5);
46 const SkColor kResultDefaultTextColor = SkColorSetRGB(0x33, 0x33, 0x33); 38 const SkColor kResultDefaultTextColor = SkColorSetRGB(0x33, 0x33, 0x33);
47 const SkColor kResultDimmedTextColor = SkColorSetRGB(0x84, 0x84, 0x84); 39 const SkColor kResultDimmedTextColor = SkColorSetRGB(0x84, 0x84, 0x84);
48 const SkColor kResultURLTextColor = SkColorSetRGB(0x00, 0x99, 0x33); 40 const SkColor kResultURLTextColor = SkColorSetRGB(0x00, 0x99, 0x33);
49 41
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 case 2: 148 case 2:
157 return gfx::ShadowValue(gfx::Vector2d(0, 2), 4, 149 return gfx::ShadowValue(gfx::Vector2d(0, 2), 4,
158 SkColorSetARGB(0x33, 0, 0, 0)); 150 SkColorSetARGB(0x33, 0, 0, 0));
159 default: 151 default:
160 return gfx::ShadowValue(gfx::Vector2d(0, 8), 12, 152 return gfx::ShadowValue(gfx::Vector2d(0, 8), 12,
161 SkColorSetARGB(0x3F, 0, 0, 0)); 153 SkColorSetARGB(0x3F, 0, 0, 0));
162 } 154 }
163 } 155 }
164 156
165 } // namespace app_list 157 } // namespace app_list
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/cocoa/apps_search_results_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698