Commit bf2eb0d6 authored by Ismael Asensio's avatar Ismael Asensio Committed by Elvis Angelaccio
Browse files

Fix selection rect after porting from QFontMetrics::width()

After porting from QFontMetrics::width() to QFontMetrics::boundigRect().width() in !10 we have a visual bug on selection rects, that can be seen on details and compact modes.

While from https://kdepepo.wordpress.com/2019/08/05/about-deprecation-of-qfontmetricswidth/ the use of `boundingRect()` would seem the right option to use (and I struggle to get the difference between the two methods when applied to a whole string and not a single char), in this case the `horizontalAdvance()` seems to return the value we need.

BUG: 421973
FIXED-IN: 20.07.70
parent ee6e1e03
......@@ -88,7 +88,7 @@ qreal KStandardItemListWidgetInformant::preferredRoleColumnWidth(const QByteArra
// If current item is a link, we use the customized link font metrics instead of the normal font metrics.
const QFontMetrics& fontMetrics = itemIsLink(index, view) ? linkFontMetrics : normalFontMetrics;
width += fontMetrics.boundingRect(text).width();
width += fontMetrics.horizontalAdvance(text);
if (role == "text") {
if (view->supportsItemExpanding()) {
......@@ -214,12 +214,12 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
qreal maximumRequiredWidth = 0.0;
if (showOnlyTextRole) {
maximumRequiredWidth = fontMetrics.boundingRect(itemText(index, view)).width();
maximumRequiredWidth = fontMetrics.horizontalAdvance(itemText(index, view));
} else {
const QHash<QByteArray, QVariant>& values = view->model()->data(index);
foreach (const QByteArray& role, visibleRoles) {
const QString& text = roleText(role, values);
const qreal requiredWidth = fontMetrics.boundingRect(text).width();
const qreal requiredWidth = fontMetrics.horizontalAdvance(text);
maximumRequiredWidth = qMax(maximumRequiredWidth, requiredWidth);
}
}
......@@ -478,7 +478,7 @@ QRectF KStandardItemListWidget::textFocusRect() const
const KItemListStyleOption& option = styleOption();
if (option.extendedSelectionRegion) {
const QString text = textInfo->staticText.text();
rect.setWidth(m_customizedFontMetrics.boundingRect(text).width() + 2 * option.padding);
rect.setWidth(m_customizedFontMetrics.horizontalAdvance(text) + 2 * option.padding);
}
return rect;
......@@ -1119,7 +1119,7 @@ QString KStandardItemListWidget::elideRightKeepExtension(const QString &text, in
if (extensionIndex != -1) {
// has file extension
const auto extensionLength = text.length() - extensionIndex;
const auto extensionWidth = m_customizedFontMetrics.boundingRect(text.right(extensionLength)).width();
const auto extensionWidth = m_customizedFontMetrics.horizontalAdvance(text.right(extensionLength));
if (elidingWidth > extensionWidth && extensionLength < 6 && (float(extensionWidth) / float(elidingWidth)) < 0.3) {
// if we have room to display the file extension and the extension is not too long
QString ret = m_customizedFontMetrics.elidedText(text.chopped(extensionLength),
......@@ -1188,7 +1188,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
const QString elidedText = nameText.left(line.textStart()) + lastTextLine;
nameTextInfo->staticText.setText(elidedText);
lastLineWidth = m_customizedFontMetrics.boundingRect(lastTextLine).width();
lastLineWidth = m_customizedFontMetrics.horizontalAdvance(lastTextLine);
// We do the text eliding in a loop with decreasing width (1 px / iteration)
// to avoid problems related to different width calculation code paths
......@@ -1241,7 +1241,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
if (requiredWidth > maxWidth) {
const QString elidedText = elideRightKeepExtension(text, maxWidth);
textInfo->staticText.setText(elidedText);
requiredWidth = m_customizedFontMetrics.boundingRect(elidedText).width();
requiredWidth = m_customizedFontMetrics.horizontalAdvance(elidedText);
} else if (role == "rating") {
// Use the width of the rating pixmap, because the rating text is empty.
requiredWidth = m_rating.width();
......@@ -1285,7 +1285,7 @@ void KStandardItemListWidget::updateCompactLayoutTextCache()
TextInfo* textInfo = m_textInfo.value(role);
textInfo->staticText.setText(text);
qreal requiredWidth = m_customizedFontMetrics.boundingRect(text).width();
qreal requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);
if (requiredWidth > maxWidth) {
requiredWidth = maxWidth;
const QString elidedText = elideRightKeepExtension(text, maxWidth);
......@@ -1300,7 +1300,7 @@ void KStandardItemListWidget::updateCompactLayoutTextCache()
y += lineSpacing;
}
m_textRect = QRectF(x - 2 * option.padding, 0, maximumRequiredTextWidth + 3 * option.padding, widgetHeight);
m_textRect = QRectF(x - option.padding, 0, maximumRequiredTextWidth + 2 * option.padding, widgetHeight);
}
void KStandardItemListWidget::updateDetailsLayoutTextCache()
......@@ -1335,7 +1335,7 @@ void KStandardItemListWidget::updateDetailsLayoutTextCache()
QString text = roleText(role, values);
// Elide the text in case it does not fit into the available column-width
qreal requiredWidth = m_customizedFontMetrics.boundingRect(text).width();
qreal requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);
const qreal roleWidth = columnWidth(role);
qreal availableTextWidth = roleWidth - columnWidthInc;
......@@ -1346,7 +1346,7 @@ void KStandardItemListWidget::updateDetailsLayoutTextCache()
if (requiredWidth > availableTextWidth) {
text = elideRightKeepExtension(text, availableTextWidth);
requiredWidth = m_customizedFontMetrics.boundingRect(text).width();
requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);
}
TextInfo* textInfo = m_textInfo.value(role);
......@@ -1358,8 +1358,8 @@ void KStandardItemListWidget::updateDetailsLayoutTextCache()
const qreal textWidth = option.extendedSelectionRegion
? size().width() - textInfo->pos.x()
: requiredWidth + 2 * option.padding;
m_textRect = QRectF(textInfo->pos.x() - 2 * option.padding, 0,
textWidth + option.padding, size().height());
m_textRect = QRectF(textInfo->pos.x() - option.padding, 0,
textWidth, size().height());
// The column after the name should always be aligned on the same x-position independent
// from the expansion-level shown in the name column
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment