avoid temporary in QStyle::itemTextRect()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-07-04 14:15:21 +00:00
parent d13e57128a
commit f63d3126ba

View file

@ -456,19 +456,17 @@ void QStyle::polish(QPalette & /* pal */)
QRect QStyle::itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled, QRect QStyle::itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled,
const QString &text) const const QString &text) const
{ {
QRect result;
int x, y, w, h; int x, y, w, h;
rect.getRect(&x, &y, &w, &h); rect.getRect(&x, &y, &w, &h);
if (!text.isEmpty()) { if (!text.isEmpty()) {
result = metrics.boundingRect(x, y, w, h, alignment, text); QRect result = metrics.boundingRect(x, y, w, h, alignment, text);
if (!enabled && proxy()->styleHint(SH_EtchDisabledText)) { if (!enabled && proxy()->styleHint(SH_EtchDisabledText)) {
result.setWidth(result.width()+1); result.setWidth(result.width()+1);
result.setHeight(result.height()+1); result.setHeight(result.height()+1);
} }
} else { return result;
result = QRect(x, y, w, h);
} }
return result; return QRect(x, y, w, h);
} }
/*! /*!