diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-24 18:33:57 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-24 18:33:57 +0000 |
| commit | 5f10e651b4149013c3ce8b0116f21adde21835bb (patch) | |
| tree | 0f47b424c818285563df036f6b4e9d5471bdfe9c /views | |
| parent | 56ee0b56f44f89ab3475756fb95ad98e5e3dbfa1 (diff) | |
| download | chromium_src-5f10e651b4149013c3ce8b0116f21adde21835bb.zip chromium_src-5f10e651b4149013c3ce8b0116f21adde21835bb.tar.gz chromium_src-5f10e651b4149013c3ce8b0116f21adde21835bb.tar.bz2 | |
Previous change to label caused incorrect layout in Windows.
Review URL: http://codereview.chromium.org/337018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rwxr-xr-x | views/controls/label.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index 6b17338..6da6c48 100755 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -264,12 +264,7 @@ const GURL Label::GetURL() const { gfx::Size Label::GetTextSize() { if (!text_size_valid_) { - int w = 0, h = 0; - gfx::Canvas cc(0, 0, true); - int flags = is_multi_line_ ? ComputeMultiLineFlags() : 0; - - cc.SizeStringInt(text_, font_, &w, &h, flags); - text_size_.SetSize(w, h); + text_size_.SetSize(font_.GetStringWidth(text_), font_.height()); if (highlighted_) text_size_.Enlarge(1, 1); text_size_valid_ = true; |