X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fui%2Fbase%2Fcocoa%2Fcontrols%2Fblue_label_button.mm;h=fad0a013bda45a260c4961640529aef3619f79ba;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=cb854339a81fc75da133221fc90a0f9c5a2ba33d;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ui/base/cocoa/controls/blue_label_button.mm b/src/ui/base/cocoa/controls/blue_label_button.mm index cb85433..fad0a01 100644 --- a/src/ui/base/cocoa/controls/blue_label_button.mm +++ b/src/ui/base/cocoa/controls/blue_label_button.mm @@ -12,7 +12,6 @@ const CGFloat kCornerRadius = 2; -const CGFloat kButtonFontSizeDelta = -1; const CGFloat kTopBottomTextPadding = 7; const CGFloat kLeftRightTextPadding = 15; const SkColor kTextShadowColor = SkColorSetRGB(0x53, 0x8c, 0xea); @@ -54,8 +53,8 @@ const SkColor kPressOuterRingColor = SkColorSetRGB(0x23, 0x52, 0xa2); + (NSAttributedString*)generateAttributedString:(NSString*)buttonText { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - NSFont* buttonFont = rb.GetFont(ui::ResourceBundle::BaseFont). - DeriveFont(kButtonFontSizeDelta).GetNativeFont(); + NSFont* buttonFont = rb.GetFontList(ui::ResourceBundle::SmallFont). + GetPrimaryFont().GetNativeFont(); base::scoped_nsobject buttonTextParagraphStyle( [[NSMutableParagraphStyle alloc] init]); [buttonTextParagraphStyle setAlignment:NSCenterTextAlignment];