diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:46:44 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:46:44 +0000 |
| commit | b6a3498936575542aa76c403c08aca732b20de41 (patch) | |
| tree | 9a017f1c4e5da8f2f83aed5de90d914f48a13fe8 /views/controls | |
| parent | 40c26450913268e571f7948436afb5e28888ecf6 (diff) | |
| download | chromium_src-b6a3498936575542aa76c403c08aca732b20de41.zip chromium_src-b6a3498936575542aa76c403c08aca732b20de41.tar.gz chromium_src-b6a3498936575542aa76c403c08aca732b20de41.tar.bz2 | |
Remove a hack that, as far as I can tell, isn't needed.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/871005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/label.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index 9837a89..43e5988 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -197,11 +197,7 @@ void Label::Paint(gfx::Canvas* canvas) { if (HasFocus() || paint_as_focused_) { int w = text_bounds.width(); int h = 0; - // We explicitly OR in MULTI_LINE here since SizeStringInt seems to return - // an incorrect height for single line text when the MULTI_LINE flag isn't - // specified. o_O... - gfx::Canvas::SizeStringInt(paint_text, font_, &w, &h, - flags | gfx::Canvas::MULTI_LINE); + gfx::Canvas::SizeStringInt(paint_text, font_, &w, &h, flags); gfx::Rect focus_rect = text_bounds; focus_rect.set_width(w); focus_rect.set_height(h); |