OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/gfx/platform_font_ios.h" | 5 #include "ui/gfx/platform_font_ios.h" |
6 | 6 |
7 #import <UIKit/UIKit.h> | 7 #import <UIKit/UIKit.h> |
8 | 8 |
| 9 #include <cmath> |
| 10 |
9 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
10 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
11 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
12 #include "ui/gfx/font.h" | 14 #include "ui/gfx/font.h" |
13 #include "ui/gfx/font_render_params.h" | 15 #include "ui/gfx/font_render_params.h" |
14 | 16 |
15 namespace gfx { | 17 namespace gfx { |
16 | 18 |
17 //////////////////////////////////////////////////////////////////////////////// | 19 //////////////////////////////////////////////////////////////////////////////// |
18 // PlatformFontIOS, public: | 20 // PlatformFontIOS, public: |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 font_size_ = font_size; | 105 font_size_ = font_size; |
104 style_ = style; | 106 style_ = style; |
105 CalculateMetrics(); | 107 CalculateMetrics(); |
106 } | 108 } |
107 | 109 |
108 void PlatformFontIOS::CalculateMetrics() { | 110 void PlatformFontIOS::CalculateMetrics() { |
109 UIFont* font = GetNativeFont(); | 111 UIFont* font = GetNativeFont(); |
110 height_ = font.lineHeight; | 112 height_ = font.lineHeight; |
111 ascent_ = font.ascender; | 113 ascent_ = font.ascender; |
112 cap_height_ = font.capHeight; | 114 cap_height_ = font.capHeight; |
113 average_width_ = [@"x" sizeWithFont:font].width; | 115 NSDictionary* attributes = @{ NSFontAttributeName : font }; |
| 116 average_width_ = std::ceil([@"x" sizeWithAttributes:attributes].width); |
114 } | 117 } |
115 | 118 |
116 //////////////////////////////////////////////////////////////////////////////// | 119 //////////////////////////////////////////////////////////////////////////////// |
117 // PlatformFont, public: | 120 // PlatformFont, public: |
118 | 121 |
119 // static | 122 // static |
120 PlatformFont* PlatformFont::CreateDefault() { | 123 PlatformFont* PlatformFont::CreateDefault() { |
121 return new PlatformFontIOS; | 124 return new PlatformFontIOS; |
122 } | 125 } |
123 | 126 |
124 // static | 127 // static |
125 PlatformFont* PlatformFont::CreateFromNativeFont(NativeFont native_font) { | 128 PlatformFont* PlatformFont::CreateFromNativeFont(NativeFont native_font) { |
126 return new PlatformFontIOS(native_font); | 129 return new PlatformFontIOS(native_font); |
127 } | 130 } |
128 | 131 |
129 // static | 132 // static |
130 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, | 133 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, |
131 int font_size) { | 134 int font_size) { |
132 return new PlatformFontIOS(font_name, font_size); | 135 return new PlatformFontIOS(font_name, font_size); |
133 } | 136 } |
134 | 137 |
135 } // namespace gfx | 138 } // namespace gfx |
OLD | NEW |