diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
| commit | 13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5 (patch) | |
| tree | ada8d64cbd2fd12c7248cca648e47ebd63e6462a /views/controls/label.cc | |
| parent | cd4857b64f3e3b10ebfa3f44c38af0dc7376d5bb (diff) | |
| download | chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.zip chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.gz chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.bz2 | |
Change Font.GetStringWidth() to take string16 instead of wstring.
do a bunch of string fixes along the way.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/5985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label.cc')
| -rw-r--r-- | views/controls/label.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index b228c78b..cdf2c8a 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -186,7 +186,8 @@ bool Label::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { // Show the full text if the text does not fit. if (!is_multi_line_ && - (font_.GetStringWidth(text_) > GetAvailableRect().width())) { + (font_.GetStringWidth(WideToUTF16Hack(text_)) > + GetAvailableRect().width())) { *tooltip = text_; return true; } @@ -237,8 +238,10 @@ void Label::SizeToFit(int max_width) { int label_width = 0; for (std::vector<std::wstring>::const_iterator iter = lines.begin(); - iter != lines.end(); ++iter) - label_width = std::max(label_width, font_.GetStringWidth(*iter)); + iter != lines.end(); ++iter) { + label_width = std::max(label_width, + font_.GetStringWidth(WideToUTF16Hack(*iter))); + } label_width += GetInsets().width(); |