diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 21:11:14 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 21:11:14 +0000 |
| commit | 9d722ada61e1d80f0900a9ed7293b8da6e6153e8 (patch) | |
| tree | 46dc0b90a43ce44f896bf4631f8f8c5e57afbe92 /views/controls | |
| parent | a129a2bfb9ae935a8f1e56a5e3d4bd50a2168ef0 (diff) | |
| download | chromium_src-9d722ada61e1d80f0900a9ed7293b8da6e6153e8.zip chromium_src-9d722ada61e1d80f0900a9ed7293b8da6e6153e8.tar.gz chromium_src-9d722ada61e1d80f0900a9ed7293b8da6e6153e8.tar.bz2 | |
Get the About panel to align its links correctly,
but undo a previous change to the way we measure strings in pango.
Review URL: http://codereview.chromium.org/338001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rwxr-xr-x[-rw-r--r--] | views/controls/label.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index 6da6c48..6b17338 100644..100755 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -264,7 +264,12 @@ const GURL Label::GetURL() const { gfx::Size Label::GetTextSize() { if (!text_size_valid_) { - text_size_.SetSize(font_.GetStringWidth(text_), font_.height()); + 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); if (highlighted_) text_size_.Enlarge(1, 1); text_size_valid_ = true; |