OLD | NEW |
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 #import "ui/app_list/cocoa/signin_view_controller.h" | 5 #import "ui/app_list/cocoa/signin_view_controller.h" |
6 | 6 |
7 #include "base/mac/foundation_util.h" | 7 #include "base/mac/foundation_util.h" |
8 #include "base/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" |
9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
10 #include "skia/ext/skia_utils_mac.h" | 10 #include "skia/ext/skia_utils_mac.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 origin.x -= kTextFieldPadding; | 124 origin.x -= kTextFieldPadding; |
125 origin.y -= NSHeight([textField bounds]); | 125 origin.y -= NSHeight([textField bounds]); |
126 [textField setFrameOrigin:origin]; | 126 [textField setFrameOrigin:origin]; |
127 return textField.autorelease(); | 127 return textField.autorelease(); |
128 } | 128 } |
129 | 129 |
130 - (void)populateAndLayoutView { | 130 - (void)populateAndLayoutView { |
131 NSView* signinView = [self view]; | 131 NSView* signinView = [self view]; |
132 NSRect frame = [signinView frame]; | 132 NSRect frame = [signinView frame]; |
133 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 133 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
134 gfx::Font baseFont = rb.GetFont(ui::ResourceBundle::BaseFont); | 134 const gfx::FontList& baseFontList = |
| 135 rb.GetFontList(ui::ResourceBundle::BaseFont); |
135 | 136 |
136 NSString* titleText = base::SysUTF16ToNSString(delegate_->GetSigninHeading()); | 137 NSString* titleText = base::SysUTF16ToNSString(delegate_->GetSigninHeading()); |
137 NSFont* titleFont = baseFont.DeriveFont(kTitleFontSizeDelta).GetNativeFont(); | 138 NSFont* titleFont = baseFontList.DeriveWithSizeDelta(kTitleFontSizeDelta) |
| 139 .GetPrimaryFont().GetNativeFont(); |
138 NSRect rect = NSMakeRect(kLeftPadding, NSHeight(frame) - kTopPadding, | 140 NSRect rect = NSMakeRect(kLeftPadding, NSHeight(frame) - kTopPadding, |
139 NSWidth(frame) - kLeftPadding - kRightPadding, 0); | 141 NSWidth(frame) - kLeftPadding - kRightPadding, 0); |
140 NSTextField* titleTextView = [self makeTextFieldWithText:titleText | 142 NSTextField* titleTextView = [self makeTextFieldWithText:titleText |
141 font:titleFont | 143 font:titleFont |
142 frame:rect]; | 144 frame:rect]; |
143 [signinView addSubview:titleTextView]; | 145 [signinView addSubview:titleTextView]; |
144 | 146 |
145 NSString* signinText = base::SysUTF16ToNSString(delegate_->GetSigninText()); | 147 NSString* signinText = base::SysUTF16ToNSString(delegate_->GetSigninText()); |
146 rect.origin.y = floor( | 148 rect.origin.y = floor( |
147 NSMinY([titleTextView frame]) + [titleFont descender] - kHeadingPadding); | 149 NSMinY([titleTextView frame]) + [titleFont descender] - kHeadingPadding); |
148 NSFont* signinTextFont = baseFont.GetNativeFont(); | 150 NSFont* signinTextFont = baseFontList.GetPrimaryFont().GetNativeFont(); |
149 NSTextField* signinTextView = [self makeTextFieldWithText:signinText | 151 NSTextField* signinTextView = [self makeTextFieldWithText:signinText |
150 font:signinTextFont | 152 font:signinTextFont |
151 frame:rect]; | 153 frame:rect]; |
152 [signinView addSubview:signinTextView]; | 154 [signinView addSubview:signinTextView]; |
153 | 155 |
154 base::scoped_nsobject<BlueLabelButton> button( | 156 base::scoped_nsobject<BlueLabelButton> button( |
155 [[BlueLabelButton alloc] initWithFrame:NSZeroRect]); | 157 [[BlueLabelButton alloc] initWithFrame:NSZeroRect]); |
156 [button setTitle:base::SysUTF16ToNSString(delegate_->GetSigninButtonText())]; | 158 [button setTitle:base::SysUTF16ToNSString(delegate_->GetSigninButtonText())]; |
157 [button setKeyEquivalent:@"\r"]; | 159 [button setKeyEquivalent:@"\r"]; |
158 [button setTarget:self]; | 160 [button setTarget:self]; |
(...skipping 30 matching lines...) Expand all Loading... |
189 @synthesize cornerRadius = cornerRadius_; | 191 @synthesize cornerRadius = cornerRadius_; |
190 | 192 |
191 - (void)drawRect:(NSRect)dirtyRect { | 193 - (void)drawRect:(NSRect)dirtyRect { |
192 [gfx::SkColorToSRGBNSColor(app_list::kContentsBackgroundColor) set]; | 194 [gfx::SkColorToSRGBNSColor(app_list::kContentsBackgroundColor) set]; |
193 [[NSBezierPath bezierPathWithRoundedRect:[self bounds] | 195 [[NSBezierPath bezierPathWithRoundedRect:[self bounds] |
194 xRadius:cornerRadius_ | 196 xRadius:cornerRadius_ |
195 yRadius:cornerRadius_] fill]; | 197 yRadius:cornerRadius_] fill]; |
196 } | 198 } |
197 | 199 |
198 @end | 200 @end |
OLD | NEW |