| Index: ui/views/controls/button/text_button.cc
|
| diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
|
| index 38e9691b19aafe85fc0020b9f0ac12a24d114e39..c24be6ce173ead6adb5ee3258b16fc558f281346 100644
|
| --- a/ui/views/controls/button/text_button.cc
|
| +++ b/ui/views/controls/button/text_button.cc
|
| @@ -374,13 +374,13 @@ void TextButtonBase::UpdateTextSize() {
|
| }
|
|
|
| void TextButtonBase::CalculateTextSize(gfx::Size* text_size, int max_width) {
|
| - int h = font_.GetHeight();
|
| - int w = multi_line_ ? max_width : 0;
|
| + float h = font_.GetHeight();
|
| + float w = multi_line_ ? max_width : 0;
|
| int flags = ComputeCanvasStringFlags();
|
| if (!multi_line_)
|
| flags |= gfx::Canvas::NO_ELLIPSIS;
|
|
|
| - gfx::Canvas::SizeStringInt(text_, font_, &w, &h, 0, flags);
|
| + gfx::Canvas::SizeStringToFit(text_, font_, &w, &h, 0, flags);
|
| text_size->SetSize(w, h);
|
| }
|
|
|
|
|