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

Side by Side Diff: ui/native_theme/common_theme.cc

Issue 2813703003: Use NativeTheme to draw vertical menu separators. (Closed)
Patch Set: use rectf Created 3 years, 8 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/base/models/menu_separator_types.h ('k') | ui/native_theme/native_theme.h » ('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/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 "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/base/material_design/material_design_controller.h" 10 #include "ui/base/material_design/material_design_controller.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 static const SkColor kBlueButtonTextColor = SK_ColorWHITE; 63 static const SkColor kBlueButtonTextColor = SK_ColorWHITE;
64 static const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA); 64 static const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA);
65 // MenuItem: 65 // MenuItem:
66 static const SkColor kMenuBackgroundColor = SK_ColorWHITE; 66 static const SkColor kMenuBackgroundColor = SK_ColorWHITE;
67 static const SkColor kMenuHighlightBackgroundColor = 67 static const SkColor kMenuHighlightBackgroundColor =
68 SkColorSetA(SK_ColorBLACK, 0x14); 68 SkColorSetA(SK_ColorBLACK, 0x14);
69 static const SkColor kSelectedMenuItemForegroundColor = SK_ColorBLACK; 69 static const SkColor kSelectedMenuItemForegroundColor = SK_ColorBLACK;
70 static const SkColor kDisabledMenuItemForegroundColor = 70 static const SkColor kDisabledMenuItemForegroundColor =
71 SkColorSetRGB(0xA1, 0xA1, 0x92); 71 SkColorSetRGB(0xA1, 0xA1, 0x92);
72 static const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA); 72 static const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA);
73 static const SkColor kEnabledMenuButtonBorderColor =
74 SkColorSetA(SK_ColorBLACK, 0x24);
75 static const SkColor kFocusedMenuButtonBorderColor =
76 SkColorSetA(SK_ColorBLACK, 0x48);
77 static const SkColor kMenuSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9); 73 static const SkColor kMenuSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9);
78 static const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK; 74 static const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK;
79 // Separator: 75 // Separator:
80 static const SkColor kSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9); 76 static const SkColor kSeparatorColor = SkColorSetRGB(0xE9, 0xE9, 0xE9);
81 // Link: 77 // Link:
82 static const SkColor kLinkEnabledColor = gfx::kGoogleBlue700; 78 static const SkColor kLinkEnabledColor = gfx::kGoogleBlue700;
83 // Text selection colors: 79 // Text selection colors:
84 static const SkColor kTextSelectionBackgroundFocused = 80 static const SkColor kTextSelectionBackgroundFocused =
85 SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB); 81 SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB);
86 static const SkColor kTextSelectionColor = color_utils::AlphaBlend( 82 static const SkColor kTextSelectionColor = color_utils::AlphaBlend(
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 case NativeTheme::kColorId_ButtonPressedShade: 158 case NativeTheme::kColorId_ButtonPressedShade:
163 return SK_ColorTRANSPARENT; 159 return SK_ColorTRANSPARENT;
164 case NativeTheme::kColorId_ButtonDisabledColor: 160 case NativeTheme::kColorId_ButtonDisabledColor:
165 return kDisabledMenuItemForegroundColor; 161 return kDisabledMenuItemForegroundColor;
166 162
167 // MenuItem 163 // MenuItem
168 case NativeTheme::kColorId_SelectedMenuItemForegroundColor: 164 case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
169 return kSelectedMenuItemForegroundColor; 165 return kSelectedMenuItemForegroundColor;
170 case NativeTheme::kColorId_MenuBorderColor: 166 case NativeTheme::kColorId_MenuBorderColor:
171 return kMenuBorderColor; 167 return kMenuBorderColor;
172 case NativeTheme::kColorId_EnabledMenuButtonBorderColor:
173 return kEnabledMenuButtonBorderColor;
174 case NativeTheme::kColorId_FocusedMenuButtonBorderColor:
175 case NativeTheme::kColorId_HoverMenuButtonBorderColor:
176 return kFocusedMenuButtonBorderColor;
177 case NativeTheme::kColorId_MenuSeparatorColor: 168 case NativeTheme::kColorId_MenuSeparatorColor:
178 return kMenuSeparatorColor; 169 return kMenuSeparatorColor;
179 case NativeTheme::kColorId_MenuBackgroundColor: 170 case NativeTheme::kColorId_MenuBackgroundColor:
180 return kMenuBackgroundColor; 171 return kMenuBackgroundColor;
181 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: 172 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
182 return kMenuHighlightBackgroundColor; 173 return kMenuHighlightBackgroundColor;
183 case NativeTheme::kColorId_EnabledMenuItemForegroundColor: 174 case NativeTheme::kColorId_EnabledMenuItemForegroundColor:
184 return kEnabledMenuItemForegroundColor; 175 return kEnabledMenuItemForegroundColor;
185 case NativeTheme::kColorId_DisabledMenuItemForegroundColor: 176 case NativeTheme::kColorId_DisabledMenuItemForegroundColor:
186 return kDisabledMenuItemForegroundColor; 177 return kDisabledMenuItemForegroundColor;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 return kTableGroupingIndicatorColor; 250 return kTableGroupingIndicatorColor;
260 251
261 // Table Header 252 // Table Header
262 case NativeTheme::kColorId_TableHeaderText: 253 case NativeTheme::kColorId_TableHeaderText:
263 return base_theme->GetSystemColor( 254 return base_theme->GetSystemColor(
264 NativeTheme::kColorId_EnabledMenuItemForegroundColor); 255 NativeTheme::kColorId_EnabledMenuItemForegroundColor);
265 case NativeTheme::kColorId_TableHeaderBackground: 256 case NativeTheme::kColorId_TableHeaderBackground:
266 return base_theme->GetSystemColor( 257 return base_theme->GetSystemColor(
267 NativeTheme::kColorId_MenuBackgroundColor); 258 NativeTheme::kColorId_MenuBackgroundColor);
268 case NativeTheme::kColorId_TableHeaderSeparator: 259 case NativeTheme::kColorId_TableHeaderSeparator:
269 return base_theme->GetSystemColor( 260 return base_theme->GetSystemColor(NativeTheme::kColorId_MenuBorderColor);
270 NativeTheme::kColorId_EnabledMenuButtonBorderColor);
271 261
272 // FocusableBorder 262 // FocusableBorder
273 case NativeTheme::kColorId_FocusedBorderColor: 263 case NativeTheme::kColorId_FocusedBorderColor:
274 return gfx::kGoogleBlue500; 264 return gfx::kGoogleBlue500;
275 case NativeTheme::kColorId_UnfocusedBorderColor: 265 case NativeTheme::kColorId_UnfocusedBorderColor:
276 return SkColorSetA(SK_ColorBLACK, 0x66); 266 return SkColorSetA(SK_ColorBLACK, 0x66);
277 267
278 // Results Tables 268 // Results Tables
279 case NativeTheme::kColorId_ResultsTableNormalBackground: 269 case NativeTheme::kColorId_ResultsTableNormalBackground:
280 return kTextfieldDefaultBackground; 270 return kTextfieldDefaultBackground;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 } 348 }
359 if (menu_item.corner_radius > 0) { 349 if (menu_item.corner_radius > 0) {
360 const SkScalar radius = SkIntToScalar(menu_item.corner_radius); 350 const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
361 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, flags); 351 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, flags);
362 return; 352 return;
363 } 353 }
364 canvas->drawRect(gfx::RectToSkRect(rect), flags); 354 canvas->drawRect(gfx::RectToSkRect(rect), flags);
365 } 355 }
366 356
367 } // namespace ui 357 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/models/menu_separator_types.h ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698