| Index: ui/views/controls/button/label_button.cc
|
| diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
|
| index 9c471671bb0452c9f16b31b2d1404e5f41a84b11..e33b7b07585aad0811480eda2d1844dd234035a3 100644
|
| --- a/ui/views/controls/button/label_button.cc
|
| +++ b/ui/views/controls/button/label_button.cc
|
| @@ -249,7 +249,7 @@ gfx::Size LabelButton::GetPreferredSize() const {
|
| return cached_preferred_size_;
|
|
|
| // Use a temporary label copy for sizing to avoid calculation side-effects.
|
| - Label label(GetText(), cached_normal_font_list_);
|
| + Label label(GetText(), label_->font_list());
|
| label.SetShadows(label_->shadows());
|
|
|
| if (style_ == STYLE_BUTTON && PlatformStyle::kDefaultLabelButtonHasBoldFont) {
|
| @@ -258,7 +258,7 @@ gfx::Size LabelButton::GetPreferredSize() const {
|
| const int current_width = label.GetPreferredSize().width();
|
| label.SetFontList(cached_bold_font_list_);
|
| if (label.GetPreferredSize().width() < current_width)
|
| - label.SetFontList(cached_normal_font_list_);
|
| + label.SetFontList(label_->font_list());
|
| }
|
|
|
| // Calculate the required size.
|
|
|