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

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

Issue 360123003: Don't put a text shadow on blue buttons in gtk theme mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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 "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"
(...skipping 21 matching lines...) Expand all
32 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK; 32 const SkColor kEnabledMenuItemForegroundColor = SK_ColorBLACK;
33 const SkColor kDisabledMenuItemForegroundColor = SkColorSetRGB(161, 161, 146); 33 const SkColor kDisabledMenuItemForegroundColor = SkColorSetRGB(161, 161, 146);
34 const SkColor kHoverMenuItemBackgroundColor = 34 const SkColor kHoverMenuItemBackgroundColor =
35 SkColorSetARGB(204, 255, 255, 255); 35 SkColorSetARGB(204, 255, 255, 255);
36 // Button: 36 // Button:
37 const SkColor kButtonHoverBackgroundColor = SkColorSetRGB(0xEA, 0xEA, 0xEA); 37 const SkColor kButtonHoverBackgroundColor = SkColorSetRGB(0xEA, 0xEA, 0xEA);
38 const SkColor kBlueButtonEnabledColor = SK_ColorWHITE; 38 const SkColor kBlueButtonEnabledColor = SK_ColorWHITE;
39 const SkColor kBlueButtonDisabledColor = SK_ColorWHITE; 39 const SkColor kBlueButtonDisabledColor = SK_ColorWHITE;
40 const SkColor kBlueButtonPressedColor = SK_ColorWHITE; 40 const SkColor kBlueButtonPressedColor = SK_ColorWHITE;
41 const SkColor kBlueButtonHoverColor = SK_ColorWHITE; 41 const SkColor kBlueButtonHoverColor = SK_ColorWHITE;
42 const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA);
42 43
43 } // namespace 44 } // namespace
44 45
45 namespace ui { 46 namespace ui {
46 47
47 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { 48 bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) {
48 switch (color_id) { 49 switch (color_id) {
49 // MenuItem 50 // MenuItem
50 case NativeTheme::kColorId_MenuBorderColor: 51 case NativeTheme::kColorId_MenuBorderColor:
51 *color = kMenuBorderColor; 52 *color = kMenuBorderColor;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 *color = kBlueButtonEnabledColor; 95 *color = kBlueButtonEnabledColor;
95 break; 96 break;
96 case NativeTheme::kColorId_BlueButtonDisabledColor: 97 case NativeTheme::kColorId_BlueButtonDisabledColor:
97 *color = kBlueButtonDisabledColor; 98 *color = kBlueButtonDisabledColor;
98 break; 99 break;
99 case NativeTheme::kColorId_BlueButtonPressedColor: 100 case NativeTheme::kColorId_BlueButtonPressedColor:
100 *color = kBlueButtonPressedColor; 101 *color = kBlueButtonPressedColor;
101 break; 102 break;
102 case NativeTheme::kColorId_BlueButtonHoverColor: 103 case NativeTheme::kColorId_BlueButtonHoverColor:
103 *color = kBlueButtonHoverColor; 104 *color = kBlueButtonHoverColor;
105 case NativeTheme::kColorId_BlueButtonShadowColor:
106 *color = kBlueButtonShadowColor;
104 break; 107 break;
105 default: 108 default:
106 return false; 109 return false;
107 } 110 }
108 111
109 if (gfx::IsInvertedColorScheme()) { 112 if (gfx::IsInvertedColorScheme()) {
110 switch (color_id) { 113 switch (color_id) {
111 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: 114 case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
112 *color = kMenuInvertedSchemeHighlightBackgroundColor; 115 *color = kMenuInvertedSchemeHighlightBackgroundColor;
113 break; 116 break;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { 207 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) {
205 // TODO(pkotwicz): Do something better and don't infer device 208 // TODO(pkotwicz): Do something better and don't infer device
206 // scale factor from canvas scale. 209 // scale factor from canvas scale.
207 SkMatrix m = sk_canvas->getTotalMatrix(); 210 SkMatrix m = sk_canvas->getTotalMatrix();
208 float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); 211 float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX()));
209 return scoped_ptr<gfx::Canvas>( 212 return scoped_ptr<gfx::Canvas>(
210 gfx::Canvas::CreateCanvasWithoutScaling(sk_canvas, device_scale)); 213 gfx::Canvas::CreateCanvasWithoutScaling(sk_canvas, device_scale));
211 } 214 }
212 215
213 } // namespace ui 216 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698