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

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm

Issue 11348343: Use bold for default constrained window button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm
index 0d9ad450bc184810a6cb7e24b609b47cfd095b3e..fb07d84e51cb6193c3b23af91572c9dbcc84df5c 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_button.mm
@@ -5,6 +5,7 @@
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
#include "base/memory/scoped_nsobject.h"
+#import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
#include "skia/ext/skia_utils_mac.h"
#import "third_party/molokocacao/NSBezierPath+MCAdditions.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
@@ -79,6 +80,7 @@ NSColor* GetButtonBorderColor(ButtonState button_state) {
}
NSAttributedString* GetButtonAttributedString(NSString* title,
+ NSString* key_equivalent,
ButtonState button_state) {
const SkColor text_color[] = {0xFF333333, 0XFF000000, 0xFF000000, 0xFFAAAAAA};
// The shadow color should be 0xFFF0F0F0 but that doesn't show up so use
@@ -96,8 +98,14 @@ NSAttributedString* GetButtonAttributedString(NSString* title,
[[NSMutableParagraphStyle alloc] init]);
[paragraphStyle setAlignment:NSCenterTextAlignment];
+ NSFont* font = nil;
+ if ([key_equivalent isEqualToString:kKeyEquivalentReturn])
+ font = [NSFont boldSystemFontOfSize:12];
+ else
+ font = [NSFont systemFontOfSize:12];
+
NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSFont systemFontOfSize:12], NSFontAttributeName,
+ font, NSFontAttributeName,
gfx::SkColorToCalibratedNSColor(text_color[button_state]),
NSForegroundColorAttributeName,
shadow.get(), NSShadowAttributeName,
@@ -212,15 +220,15 @@ NSAttributedString* GetButtonAttributedString(NSString* title,
[GetButtonBorderColor(buttonState) set];
[path stroke];
- [self drawTitle:GetButtonAttributedString([self title], buttonState)
- withFrame:frame
- inView:controlView];
+ NSAttributedString* title = GetButtonAttributedString(
+ [self title], [self keyEquivalent], buttonState);
+ [self drawTitle:title withFrame:frame inView:controlView];
}
- (NSSize)cellSize {
- NSAttributedString* attributedString =
- GetButtonAttributedString([self title], BUTTON_NORMAL);
- NSSize size = [attributedString size];
+ NSAttributedString* title = GetButtonAttributedString(
+ [self title], [self keyEquivalent], [self buttonState]);
+ NSSize size = [title size];
size.height = std::max(size.height, kButtonHeight);
size.width += kButtonPaddingX * 2;
return size;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698