OLD | NEW |
---|---|
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/native_theme/common_theme.h" | 5 #include "ui/native_theme/common_theme.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
9 #include "third_party/skia/include/core/SkCanvas.h" | 9 #include "third_party/skia/include/core/SkCanvas.h" |
10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
11 #include "ui/gfx/color_utils.h" | 11 #include "ui/gfx/color_utils.h" |
12 #include "ui/gfx/image/image_skia.h" | 12 #include "ui/gfx/image/image_skia.h" |
13 #include "ui/gfx/rect.h" | 13 #include "ui/gfx/rect.h" |
14 #include "ui/gfx/skia_util.h" | 14 #include "ui/gfx/skia_util.h" |
15 #include "ui/gfx/sys_color_change_listener.h" | 15 #include "ui/gfx/sys_color_change_listener.h" |
16 #include "ui/views/controls/menu/menu_config.h" | 16 #include "ui/views/controls/menu/menu_config.h" |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 // Theme colors returned by GetSystemColor(). | 20 // Theme colors returned by GetSystemColor(). |
21 | 21 |
22 // MenuItem: | 22 // MenuItem: |
23 const SkColor kMenuBackgroundColor = SK_ColorWHITE; | 23 const SkColor kMenuBackgroundColor = SK_ColorWHITE; |
24 const SkColor kMenuHighlightBackgroundColor = SkColorSetA(SK_ColorBLACK, 15); | 24 const SkColor kMenuHighlightBackgroundColor = SkColorSetA(SK_ColorBLACK, 15); |
25 const SkColor kMenuInvertedSchemeHighlightBackgroundColor = | 25 const SkColor kMenuInvertedSchemeHighlightBackgroundColor = |
26 SkColorSetRGB(48, 48, 48); | 26 SkColorSetRGB(48, 48, 48); |
27 const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA); | 27 const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA); |
28 const SkColor kHoverBorderColor = SkColorSetARGB(72, 0, 0, 0); | |
28 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9); | 29 const SkColor kMenuSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9); |
29 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK; | 30 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK; |
30 const SkColor kDisabledMenuItemForegroundColor = SkColorSetRGB(161, 161, 146); | 31 const SkColor kDisabledMenuItemForegroundColor = SkColorSetRGB(161, 161, 146); |
32 const SkColor kHoverMenuItemBackgroundColor = SkColorSetRGB(204, 204, 204); | |
31 | 33 |
32 } // namespace | 34 } // namespace |
33 | 35 |
34 namespace ui { | 36 namespace ui { |
35 | 37 |
36 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { | 38 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { |
37 switch (color_id) { | 39 switch (color_id) { |
38 // MenuItem | 40 // MenuItem |
39 case NativeTheme::kColorId_MenuBorderColor: | 41 case NativeTheme::kColorId_MenuBorderColor: |
40 *color = kMenuBorderColor; | 42 *color = kMenuBorderColor; |
41 break; | 43 break; |
44 case NativeTheme::kColorId_HoverBorderColor: | |
45 *color = kMenuBorderColor; | |
Elliot Glaysher
2013/03/18 21:38:21
kHoverBorderColor?
Bobby Powers
2013/03/19 13:27:01
Whoops, fat fingers. Fixed.
| |
46 break; | |
42 case NativeTheme::kColorId_MenuSeparatorColor: | 47 case NativeTheme::kColorId_MenuSeparatorColor: |
43 *color = kMenuSeparatorColor; | 48 *color = kMenuSeparatorColor; |
44 break; | 49 break; |
45 case NativeTheme::kColorId_MenuBackgroundColor: | 50 case NativeTheme::kColorId_MenuBackgroundColor: |
46 *color = kMenuBackgroundColor; | 51 *color = kMenuBackgroundColor; |
47 break; | 52 break; |
48 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: | 53 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: |
49 *color = kMenuHighlightBackgroundColor; | 54 *color = kMenuHighlightBackgroundColor; |
50 break; | 55 break; |
51 case NativeTheme::kColorId_EnabledMenuItemForegroundColor: | 56 case NativeTheme::kColorId_EnabledMenuItemForegroundColor: |
52 *color = kEnabledMenuItemForegroundColor; | 57 *color = kEnabledMenuItemForegroundColor; |
53 break; | 58 break; |
54 case NativeTheme::kColorId_DisabledMenuItemForegroundColor: | 59 case NativeTheme::kColorId_DisabledMenuItemForegroundColor: |
55 *color = kDisabledMenuItemForegroundColor; | 60 *color = kDisabledMenuItemForegroundColor; |
56 break; | 61 break; |
57 case NativeTheme::kColorId_TextButtonDisabledColor: | 62 case NativeTheme::kColorId_TextButtonDisabledColor: |
58 *color = kDisabledMenuItemForegroundColor; | 63 *color = kDisabledMenuItemForegroundColor; |
59 break; | 64 break; |
65 case NativeTheme::kColorId_HoverMenuItemBackgroundColor: | |
66 *color = kHoverMenuItemBackgroundColor; | |
67 break; | |
60 default: | 68 default: |
61 return false; | 69 return false; |
62 } | 70 } |
63 if (gfx::IsInvertedColorScheme()) { | 71 if (gfx::IsInvertedColorScheme()) { |
64 switch (color_id) { | 72 switch (color_id) { |
65 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: | 73 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: |
66 *color = kMenuInvertedSchemeHighlightBackgroundColor; | 74 *color = kMenuInvertedSchemeHighlightBackgroundColor; |
67 break; | 75 break; |
68 default: | 76 default: |
69 *color = color_utils::InvertColor(*color); | 77 *color = color_utils::InvertColor(*color); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
138 paint.setColor(color); | 146 paint.setColor(color); |
139 break; | 147 break; |
140 default: | 148 default: |
141 NOTREACHED() << "Invalid state " << state; | 149 NOTREACHED() << "Invalid state " << state; |
142 break; | 150 break; |
143 } | 151 } |
144 canvas->drawRect(gfx::RectToSkRect(rect), paint); | 152 canvas->drawRect(gfx::RectToSkRect(rect), paint); |
145 } | 153 } |
146 | 154 |
147 } // namespace ui | 155 } // namespace ui |
OLD | NEW |