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

Side by Side Diff: ui/views/controls/button/blue_button.cc

Issue 343513002: Refactor views::Label and gfx::RenderText shadow functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove forbidden static FontList. Created 6 years, 6 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
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/views/controls/button/label_button.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/views/controls/button/blue_button.h" 5 #include "ui/views/controls/button/blue_button.h"
6 6
7 #include "grit/ui_resources.h" 7 #include "grit/ui_resources.h"
8 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/gfx/sys_color_change_listener.h" 9 #include "ui/gfx/sys_color_change_listener.h"
10 #include "ui/views/controls/button/label_button_border.h" 10 #include "ui/views/controls/button/label_button_border.h"
(...skipping 25 matching lines...) Expand all
36 SetTextColor(STATE_NORMAL, GetNativeTheme()-> 36 SetTextColor(STATE_NORMAL, GetNativeTheme()->
37 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonEnabledColor)); 37 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonEnabledColor));
38 SetTextColor(STATE_HOVERED, GetNativeTheme()-> 38 SetTextColor(STATE_HOVERED, GetNativeTheme()->
39 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonHoverColor)); 39 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonHoverColor));
40 SetTextColor(STATE_PRESSED, GetNativeTheme()-> 40 SetTextColor(STATE_PRESSED, GetNativeTheme()->
41 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonHighlightColor)); 41 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonHighlightColor));
42 SetTextColor(STATE_DISABLED, GetNativeTheme()-> 42 SetTextColor(STATE_DISABLED, GetNativeTheme()->
43 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonDisabledColor)); 43 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonDisabledColor));
44 44
45 // TODO(estade): this is not great on system themes. 45 // TODO(estade): this is not great on system themes.
46 label()->SetShadowColors(kBlueButtonShadowColor, kBlueButtonShadowColor); 46 label()->set_shadows(gfx::ShadowValues(1,
47 label()->SetShadowOffset(0, 1); 47 gfx::ShadowValue(gfx::Point(0, 1), 0, kBlueButtonShadowColor)));
48 } 48 }
49 } 49 }
50 50
51 const char* BlueButton::GetClassName() const { 51 const char* BlueButton::GetClassName() const {
52 return BlueButton::kViewClassName; 52 return BlueButton::kViewClassName;
53 } 53 }
54 54
55 scoped_ptr<LabelButtonBorder> BlueButton::CreateDefaultBorder() const { 55 scoped_ptr<LabelButtonBorder> BlueButton::CreateDefaultBorder() const {
56 // Insets for splitting the images. 56 // Insets for splitting the images.
57 const gfx::Insets insets(5, 5, 5, 5); 57 const gfx::Insets insets(5, 5, 5, 5);
(...skipping 12 matching lines...) Expand all
70 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter( 70 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter(
71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets)); 71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets));
72 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter( 72 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter(
73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets)); 73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets));
74 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter( 74 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter(
75 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets)); 75 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));
76 return button_border.Pass(); 76 return button_border.Pass();
77 } 77 }
78 78
79 } // namespace views 79 } // namespace views
OLDNEW
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698