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

Unified Diff: ui/gfx/platform_font_win.cc

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix round-down problems Created 7 years, 2 months 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
Index: ui/gfx/platform_font_win.cc
diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc
index a97da2eedcf1ad9e2ecafb5e748a1bb33675b3a6..745f35bd679eee45ad191e67bd47fb5174d7b816 100644
--- a/ui/gfx/platform_font_win.cc
+++ b/ui/gfx/platform_font_win.cc
@@ -145,18 +145,18 @@ int PlatformFontWin::GetCapHeight() const {
return font_ref_->cap_height();
}
-int PlatformFontWin::GetAverageCharacterWidth() const {
+float PlatformFontWin::GetAverageCharacterWidth() const {
return font_ref_->ave_char_width();
}
-int PlatformFontWin::GetStringWidth(const base::string16& text) const {
+float PlatformFontWin::GetStringWidth(const base::string16& text) const {
return Canvas::GetStringWidth(text,
Font(const_cast<PlatformFontWin*>(this)));
}
-int PlatformFontWin::GetExpectedTextWidth(int length) const {
- return length * std::min(font_ref_->GetDluBaseX(),
- GetAverageCharacterWidth());
+float PlatformFontWin::GetExpectedTextWidth(int length) const {
+ return length * std::min<float>(font_ref_->GetDluBaseX(),
+ GetAverageCharacterWidth());
}
int PlatformFontWin::GetStyle() const {
« ui/gfx/canvas.h ('K') | « ui/gfx/platform_font_win.h ('k') | ui/gfx/rect_f.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698