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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm

Issue 1680773006: Implement Material Design for Mac toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_master
Patch Set: Ready for review. Created 4 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
OLDNEW
(Empty)
1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button.h"
6
7 #include "base/macros.h"
8 #import "chrome/browser/ui/cocoa/themed_window.h"
9 #import "chrome/browser/ui/cocoa/view_id_util.h"
10
11 class AppMenuButtonIconPainterDelegateMac :
12 public AppMenuIconPainter::Delegate {
13 public:
14 explicit AppMenuButtonIconPainterDelegateMac(NSButton* button) :
15 button_(button) {}
16 ~AppMenuButtonIconPainterDelegateMac() override {}
17
18 void ScheduleAppMenuIconPaint() override {
19 [button_ setNeedsDisplay:YES];
20 }
21
22 private:
23 NSButton* button_;
24
25 DISALLOW_COPY_AND_ASSIGN(AppMenuButtonIconPainterDelegateMac);
26 };
27
28 @interface AppToolbarButton ()
29 - (void)commonInit;
30 @end
31
32 @implementation AppToolbarButton
33
34 - (instancetype)initWithFrame:(NSRect)frame {
35 if ((self = [super initWithFrame:frame])) {
36 [self commonInit];
37 }
38 return self;
39 }
40
41 - (void)awakeFromNib {
42 [self commonInit];
43 }
44
45 - (void)commonInit {
46 view_id_util::SetID(self, VIEW_ID_APP_MENU);
47 delegate_.reset(new AppMenuButtonIconPainterDelegateMac(self));
48 severity_ = AppMenuIconPainter::Severity::SEVERITY_NONE;
49 }
50
51 - (SkColor)defaultColor:(BOOL)themeIsDark {
52 const SkColor normalColor = SkColorSetRGB(0x5A, 0x5A, 0x5A);
53 const SkColor normalIncognitoColor = SkColorSetRGB(0xFF, 0xFF, 0xFF);
54 const SkColor severityMedColor = SkColorSetRGB(0xF0, 0x93, 0x00);
55 const SkColor severityMedIncognitoColor = SkColorSetRGB(0xF7, 0xCB, 0x4D);
56 const SkColor severityHighColor = SkColorSetRGB(0xC5, 0x39, 0x29);
57 const SkColor severityHighIncognitoColor = SkColorSetRGB(0xE6, 0x73, 0x7C);
58
59 switch (severity_) {
60 case AppMenuIconPainter::Severity::SEVERITY_NONE:
61 case AppMenuIconPainter::Severity::SEVERITY_LOW:
62 return themeIsDark ? normalIncognitoColor : normalColor;
63 break;
64
65 case AppMenuIconPainter::Severity::SEVERITY_MEDIUM:
66 return themeIsDark ? severityMedIncognitoColor : severityMedColor;
67 break;
68
69 case AppMenuIconPainter::Severity::SEVERITY_HIGH:
70 return themeIsDark ? severityHighIncognitoColor : severityHighColor;
71 break;
72
73 default:
74 break;
75 }
76 }
77
78 - (SkColor)disabledColor:(BOOL)themeIsDark {
79 SkColor defaultColor = [self defaultColor:themeIsDark];
80
81 return SkColorSetARGB(0x33, SkColorGetR(defaultColor),
82 SkColorGetG(defaultColor), SkColorGetB(defaultColor));
83 }
84
85 - (SkColor)pressedColor:(BOOL)themeIsDark {
86 const SkColor pressedBlueColor = SkColorSetARGB(0xFF, 0x42, 0x85, 0xF4);
87 const SkColor pressedWhiteColor = SkColorSetARGB(0x7F, 0xFF, 0xFF, 0xFF);
88
89 if (severity_ == AppMenuIconPainter::Severity::SEVERITY_NONE) {
90 return themeIsDark ? pressedWhiteColor : pressedBlueColor;
91 }
92
93 SkColor defaultColor = [self defaultColor:themeIsDark];
94
95 return SkColorSetARGB(0x7F, SkColorGetR(defaultColor),
96 SkColorGetG(defaultColor), SkColorGetB(defaultColor));
97 }
98
99 - (void)setSeverity:(AppMenuIconPainter::Severity)severity
100 shouldAnimate:(BOOL)shouldAnimate {
101 if (severity != severity_) {
102 severity_ = severity;
103 [self setImagesFromIconId:gfx::VectorIconId::BROWSER_TOOLS];
104 [self setNeedsDisplay:YES];
105 }
106 }
107
108 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698