equal
deleted
inserted
replaced
289 return d->sizeHint; |
289 return d->sizeHint; |
290 ensurePolished(); |
290 ensurePolished(); |
291 QFontMetrics fm = fontMetrics(); |
291 QFontMetrics fm = fontMetrics(); |
292 QStyleOptionButton opt; |
292 QStyleOptionButton opt; |
293 initStyleOption(&opt); |
293 initStyleOption(&opt); |
294 QSize sz = style()->itemTextRect(fm, QRect(0, 0, 1, 1), Qt::TextShowMnemonic, false, |
294 QSize sz = style()->itemTextRect(fm, QRect(), Qt::TextShowMnemonic, false, |
295 text()).size(); |
295 text()).size(); |
296 if (!opt.icon.isNull()) |
296 if (!opt.icon.isNull()) |
297 sz = QSize(sz.width() + opt.iconSize.width() + 4, qMax(sz.height(), opt.iconSize.height())); |
297 sz = QSize(sz.width() + opt.iconSize.width() + 4, qMax(sz.height(), opt.iconSize.height())); |
298 d->sizeHint = (style()->sizeFromContents(QStyle::CT_CheckBox, &opt, sz, this) |
298 d->sizeHint = (style()->sizeFromContents(QStyle::CT_CheckBox, &opt, sz, this) |
299 .expandedTo(QApplication::globalStrut())); |
299 .expandedTo(QApplication::globalStrut())); |