| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "app/gfx/font.h" | 5 #include "app/gfx/font.h" |
| 6 | 6 |
| 7 #include <Cocoa/Cocoa.h> | 7 #include <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 | 65 |
| 66 int Font::GetExpectedTextWidth(int length) const { | 66 int Font::GetExpectedTextWidth(int length) const { |
| 67 return length * avg_width_; | 67 return length * avg_width_; |
| 68 } | 68 } |
| 69 | 69 |
| 70 int Font::style() const { | 70 int Font::style() const { |
| 71 return style_; | 71 return style_; |
| 72 } | 72 } |
| 73 | 73 |
| 74 std::wstring Font::FontName() { | 74 const std::wstring& Font::FontName() const { |
| 75 return font_name_; | 75 return font_name_; |
| 76 } | 76 } |
| 77 | 77 |
| 78 int Font::FontSize() { | 78 int Font::FontSize() { |
| 79 return font_size_; | 79 return font_size_; |
| 80 } | 80 } |
| 81 | 81 |
| 82 NativeFont Font::nativeFont() const { | 82 NativeFont Font::nativeFont() const { |
| 83 // TODO(pinkerton): apply |style_| to font. | 83 // TODO(pinkerton): apply |style_| to font. |
| 84 // We could cache this, but then we'd have to conditionally change the | 84 // We could cache this, but then we'd have to conditionally change the |
| 85 // dtor just for MacOS. Not sure if we want to/need to do that. | 85 // dtor just for MacOS. Not sure if we want to/need to do that. |
| 86 return [NSFont fontWithName:base::SysWideToNSString(font_name_) | 86 return [NSFont fontWithName:base::SysWideToNSString(font_name_) |
| 87 size:font_size_]; | 87 size:font_size_]; |
| 88 } | 88 } |
| 89 | 89 |
| 90 } // namespace gfx | 90 } // namespace gfx |
| OLD | NEW |