diff options
| -rw-r--r-- | chrome/common/gfx/chrome_font_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/gfx/chrome_font_win.cc b/chrome/common/gfx/chrome_font_win.cc index d297e23..6fcadc0 100644 --- a/chrome/common/gfx/chrome_font_win.cc +++ b/chrome/common/gfx/chrome_font_win.cc @@ -43,7 +43,7 @@ int ChromeFont::ave_char_width() const { } int ChromeFont::GetExpectedTextWidth(int length) const { - return length * font_ref_->dlu_base_x(); + return length * std::min(font_ref_->dlu_base_x(), ave_char_width()); } int ChromeFont::style() const { @@ -75,7 +75,7 @@ ChromeFont ChromeFont::CreateFont(const std::wstring& font_name, // static ChromeFont::HFontRef* ChromeFont::GetBaseFontRef() { if (base_font_ref_ == NULL) { - NONCLIENTMETRICS metrics; + NONCLIENTMETRICS metrics; win_util::GetNonClientMetrics(&metrics); // See comment in ChromeFont::DeriveFont() about font size. |