summaryrefslogtreecommitdiffstats
path: root/chrome/views/radio_button.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/views/radio_button.cc')
-rw-r--r--chrome/views/radio_button.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/views/radio_button.cc b/chrome/views/radio_button.cc
index 1e860e7..56e80f1 100644
--- a/chrome/views/radio_button.cc
+++ b/chrome/views/radio_button.cc
@@ -60,11 +60,13 @@ std::string RadioButton::GetClassName() const {
return kViewClassName;
}
-void RadioButton::GetPreferredSize(CSize *out) {
- label_->GetPreferredSize(out);
- out->cy = std::max(static_cast<int>(out->cy + kFocusPaddingVertical * 2),
- kRadioHeight) ;
- out->cx += kRadioToLabel + kRadioWidth + kFocusPaddingHorizontal * 2;
+gfx::Size RadioButton::GetPreferredSize() {
+ gfx::Size prefsize = label_->GetPreferredSize();
+ prefsize.set_height(std::max(prefsize.height() + kFocusPaddingVertical * 2,
+ kRadioHeight));
+ prefsize.Enlarge(kRadioToLabel + kRadioWidth + kFocusPaddingHorizontal * 2,
+ 0);
+ return prefsize;
}
void RadioButton::Layout() {