Make main view react to context menu events

[dolphin.git] / src / kitemviews / kstandarditemlistwidget.cpp

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 15c01726fa8b972775d71880bee0ca4cc7298f2d..54e1fa50b3bbb9a09af416cfbd12d0a04cb17ea0 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -1,21 +1,8 @@
-/***************************************************************************
- *   Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2012 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "kstandarditemlistwidget.h"
 
 
 #include "kstandarditemlistwidget.h"
 


@@ -30,17 +17,17 @@
 #include <KRatingPainter>
 #include <KStringHandler>
 
 #include <KRatingPainter>
 #include <KStringHandler>
 

+#include <QApplication>

 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>

-#include <QGuiApplication>

 #include <QPixmapCache>
 #include <QStyleOption>
 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG
 
 #include <QPixmapCache>
 #include <QStyleOption>
 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG
 

-KStandardItemListWidgetInformant::KStandardItemListWidgetInformant() :
-    KItemListWidgetInformant()
+KStandardItemListWidgetInformant::KStandardItemListWidgetInformant()
+    : KItemListWidgetInformant()

 {
 }
 
 {
 }
 


@@ -48,9 +35,11 @@ KStandardItemListWidgetInformant::~KStandardItemListWidgetInformant()
 {
 }
 
 {
 }
 

-void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+                                                              qreal &logicalWidthHint,
+                                                              const KItemListView *view) const

 {
 {

-    switch (static_cast<const KStandardItemListView*>(view)->itemLayout()) {
+    switch (static_cast<const KStandardItemListView *>(view)->itemLayout()) {

     case KStandardItemListView::IconsLayout:
         calculateIconsLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
         break;
     case KStandardItemListView::IconsLayout:
         calculateIconsLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
         break;


@@ -69,26 +58,24 @@ void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<qreal>& lo
     }
 }
 
     }
 }
 

-qreal KStandardItemListWidgetInformant::preferredRoleColumnWidth(const QByteArray& role,
-                                                                 int index,
-                                                                 const KItemListView* view) const
+qreal KStandardItemListWidgetInformant::preferredRoleColumnWidth(const QByteArray &role, int index, const KItemListView *view) const

 {
     const QHash<QByteArray, QVariant> values = view->model()->data(index);
 {
     const QHash<QByteArray, QVariant> values = view->model()->data(index);

-    const KItemListStyleOption& option = view->styleOption();
+    const KItemListStyleOption &option = view->styleOption();

 
     const QString text = roleText(role, values);
     qreal width = KStandardItemListWidget::columnPadding(option);
 
 
     const QString text = roleText(role, values);
     qreal width = KStandardItemListWidget::columnPadding(option);
 

-    const QFontMetrics& normalFontMetrics = option.fontMetrics;
+    const QFontMetrics &normalFontMetrics = option.fontMetrics;

     const QFontMetrics linkFontMetrics(customizedFontForLinks(option.font));
 
     if (role == "rating") {
         width += KStandardItemListWidget::preferredRatingSize(option).width();
     } else {
         // If current item is a link, we use the customized link font metrics instead of the normal font metrics.
     const QFontMetrics linkFontMetrics(customizedFontForLinks(option.font));
 
     if (role == "rating") {
         width += KStandardItemListWidget::preferredRatingSize(option).width();
     } else {
         // 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;
+        const QFontMetrics &fontMetrics = itemIsLink(index, view) ? linkFontMetrics : normalFontMetrics;

 
 

-        width += fontMetrics.width(text);
+        width += fontMetrics.horizontalAdvance(text);

 
         if (role == "text") {
             if (view->supportsItemExpanding()) {
 
         if (role == "text") {
             if (view->supportsItemExpanding()) {


@@ -106,20 +93,19 @@ qreal KStandardItemListWidgetInformant::preferredRoleColumnWidth(const QByteArra
     return width;
 }
 
     return width;
 }
 

-QString KStandardItemListWidgetInformant::itemText(int index, const KItemListView* view) const
+QString KStandardItemListWidgetInformant::itemText(int index, const KItemListView *view) const

 {
     return view->model()->data(index).value("text").toString();
 }
 
 {
     return view->model()->data(index).value("text").toString();
 }
 

-bool KStandardItemListWidgetInformant::itemIsLink(int index, const KItemListView* view) const
+bool KStandardItemListWidgetInformant::itemIsLink(int index, const KItemListView *view) const

 {
 {

-    Q_UNUSED(index);
-    Q_UNUSED(view);
+    Q_UNUSED(index)
+    Q_UNUSED(view)

     return false;
 }
 
     return false;
 }
 

-QString KStandardItemListWidgetInformant::roleText(const QByteArray& role,
-                                                   const QHash<QByteArray, QVariant>& values) const
+QString KStandardItemListWidgetInformant::roleText(const QByteArray &role, const QHash<QByteArray, QVariant> &values) const

 {
     if (role == "rating") {
         // Always use an empty text, as the rating is shown by the image m_rating.
 {
     if (role == "rating") {
         // Always use an empty text, as the rating is shown by the image m_rating.


@@ -128,15 +114,17 @@ QString KStandardItemListWidgetInformant::roleText(const QByteArray& role,
     return values.value(role).toString();
 }
 
     return values.value(role).toString();
 }
 

-QFont KStandardItemListWidgetInformant::customizedFontForLinks(const QFont& baseFont) const
+QFont KStandardItemListWidgetInformant::customizedFontForLinks(const QFont &baseFont) const

 {
     return baseFont;
 }
 
 {
     return baseFont;
 }
 

-void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+                                                                         qreal &logicalWidthHint,
+                                                                         const KItemListView *view) const

 {
 {

-    const KItemListStyleOption& option = view->styleOption();
-    const QFont& normalFont = option.font;
+    const KItemListStyleOption &option = view->styleOption();
+    const QFont &normalFont = option.font;

     const int additionalRolesCount = qMax(view->visibleRoles().count() - 1, 0);
 
     const qreal itemWidth = view->itemSize().width();
     const int additionalRolesCount = qMax(view->visibleRoles().count() - 1, 0);
 
     const qreal itemWidth = view->itemSize().width();


@@ -150,14 +138,14 @@ void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 
     for (int index = 0; index < logicalHeightHints.count(); ++index) {
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 
     for (int index = 0; index < logicalHeightHints.count(); ++index) {

-        if (logicalHeightHints.at(index) > 0.0) {
+        if (logicalHeightHints.at(index).first > 0.0) {

             continue;
         }
 
         // If the current item is a link, we use the customized link font instead of the normal font.
             continue;
         }
 
         // If the current item is a link, we use the customized link font instead of the normal font.

-        const QFont& font = itemIsLink(index, view) ? linkFont : normalFont;
+        const QFont &font = itemIsLink(index, view) ? linkFont : normalFont;

 
 

-        const QString& text = KStringHandler::preProcessWrap(itemText(index, view));
+        const QString &text = KStringHandler::preProcessWrap(itemText(index, view));

 
         // Calculate the number of lines required for wrapping the name
         qreal textHeight = 0;
 
         // Calculate the number of lines required for wrapping the name
         qreal textHeight = 0;


@@ -166,6 +154,7 @@ void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector
         layout.beginLayout();
         QTextLine line;
         int lineCount = 0;
         layout.beginLayout();
         QTextLine line;
         int lineCount = 0;

+        bool isElided = false;

         while ((line = layout.createLine()).isValid()) {
             line.setLineWidth(maxWidth);
             line.naturalTextWidth();
         while ((line = layout.createLine()).isValid()) {
             line.setLineWidth(maxWidth);
             line.naturalTextWidth();


@@ -173,6 +162,7 @@ void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector
 
             ++lineCount;
             if (lineCount == option.maxTextLines) {
 
             ++lineCount;
             if (lineCount == option.maxTextLines) {

+                isElided = layout.createLine().isValid();

                 break;
             }
         }
                 break;
             }
         }


@@ -181,19 +171,22 @@ void KStandardItemListWidgetInformant::calculateIconsLayoutItemSizeHints(QVector
         // Add one line for each additional information
         textHeight += additionalRolesSpacing;
 
         // Add one line for each additional information
         textHeight += additionalRolesSpacing;
 

-        logicalHeightHints[index] = textHeight + spacingAndIconHeight;
+        logicalHeightHints[index].first = textHeight + spacingAndIconHeight;
+        logicalHeightHints[index].second = isElided;

     }
 
     logicalWidthHint = itemWidth;
 }
 
     }
 
     logicalWidthHint = itemWidth;
 }
 

-void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+                                                                           qreal &logicalWidthHint,
+                                                                           const KItemListView *view) const

 {
 {

-    const KItemListStyleOption& option = view->styleOption();
-    const QFontMetrics& normalFontMetrics = option.fontMetrics;
+    const KItemListStyleOption &option = view->styleOption();
+    const QFontMetrics &normalFontMetrics = option.fontMetrics;

     const int additionalRolesCount = qMax(view->visibleRoles().count() - 1, 0);
 
     const int additionalRolesCount = qMax(view->visibleRoles().count() - 1, 0);
 

-    const QList<QByteArray>& visibleRoles = view->visibleRoles();
+    const QList<QByteArray> &visibleRoles = view->visibleRoles();

     const bool showOnlyTextRole = (visibleRoles.count() == 1) && (visibleRoles.first() == "text");
     const qreal maxWidth = option.maxTextWidth;
     const qreal paddingAndIconWidth = option.padding * 4 + option.iconSize;
     const bool showOnlyTextRole = (visibleRoles.count() == 1) && (visibleRoles.first() == "text");
     const qreal maxWidth = option.maxTextWidth;
     const qreal paddingAndIconWidth = option.padding * 4 + option.iconSize;


@@ -202,24 +195,24 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
     const QFontMetrics linkFontMetrics(customizedFontForLinks(option.font));
 
     for (int index = 0; index < logicalHeightHints.count(); ++index) {
     const QFontMetrics linkFontMetrics(customizedFontForLinks(option.font));
 
     for (int index = 0; index < logicalHeightHints.count(); ++index) {

-        if (logicalHeightHints.at(index) > 0.0) {
+        if (logicalHeightHints.at(index).first > 0.0) {

             continue;
         }
 
         // If the current item is a link, we use the customized link font metrics instead of the normal font metrics.
             continue;
         }
 
         // If the 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;
+        const QFontMetrics &fontMetrics = itemIsLink(index, view) ? linkFontMetrics : normalFontMetrics;

 
         // For each row exactly one role is shown. Calculate the maximum required width that is necessary
         // to show all roles without horizontal clipping.
         qreal maximumRequiredWidth = 0.0;
 
         if (showOnlyTextRole) {
 
         // For each row exactly one role is shown. Calculate the maximum required width that is necessary
         // to show all roles without horizontal clipping.
         qreal maximumRequiredWidth = 0.0;
 
         if (showOnlyTextRole) {

-            maximumRequiredWidth = fontMetrics.width(itemText(index, view));
+            maximumRequiredWidth = fontMetrics.horizontalAdvance(itemText(index, view));

         } else {
         } 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.width(text);
+            const QHash<QByteArray, QVariant> &values = view->model()->data(index);
+            for (const QByteArray &role : visibleRoles) {
+                const QString &text = roleText(role, values);
+                const qreal requiredWidth = fontMetrics.horizontalAdvance(text);

                 maximumRequiredWidth = qMax(maximumRequiredWidth, requiredWidth);
             }
         }
                 maximumRequiredWidth = qMax(maximumRequiredWidth, requiredWidth);
             }
         }


@@ -229,47 +222,51 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect
             width = maxWidth;
         }
 
             width = maxWidth;
         }
 

-        logicalHeightHints[index] = width;
+        logicalHeightHints[index].first = width;

     }
 
     logicalWidthHint = height;
 }
 
     }
 
     logicalWidthHint = height;
 }
 

-void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
+void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector<std::pair<qreal, bool>> &logicalHeightHints,
+                                                                           qreal &logicalWidthHint,
+                                                                           const KItemListView *view) const

 {
 {

-    const KItemListStyleOption& option = view->styleOption();
+    const KItemListStyleOption &option = view->styleOption();

     const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());
     const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height());

-    logicalHeightHints.fill(height);
+    logicalHeightHints.fill(std::make_pair(height, false));

     logicalWidthHint = -1.0;
 }
 
     logicalWidthHint = -1.0;
 }
 

-KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
-    KItemListWidget(informant, parent),
-    m_isCut(false),
-    m_isHidden(false),
-    m_customizedFont(),
-    m_customizedFontMetrics(m_customizedFont),
-    m_isExpandable(false),
-    m_supportsItemExpanding(false),
-    m_dirtyLayout(true),
-    m_dirtyContent(true),
-    m_dirtyContentRoles(),
-    m_layout(IconsLayout),
-    m_pixmapPos(),
-    m_pixmap(),
-    m_scaledPixmapSize(),
-    m_iconRect(),
-    m_hoverPixmap(),
-    m_textInfo(),
-    m_textRect(),
-    m_sortedVisibleRoles(),
-    m_expansionArea(),
-    m_customTextColor(),
-    m_additionalInfoTextColor(),
-    m_overlay(),
-    m_rating(),
-    m_roleEditor(nullptr),
-    m_oldRoleEditor(nullptr)
+KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent)
+    : KItemListWidget(informant, parent)
+    , m_textInfo()
+    , m_isCut(false)
+    , m_isHidden(false)
+    , m_customizedFont()
+    , m_customizedFontMetrics(m_customizedFont)
+    , m_isExpandable(false)
+    , m_highlightEntireRow(false)
+    , m_supportsItemExpanding(false)
+    , m_dirtyLayout(true)
+    , m_dirtyContent(true)
+    , m_dirtyContentRoles()
+    , m_layout(IconsLayout)
+    , m_pixmapPos()
+    , m_pixmap()
+    , m_scaledPixmapSize()
+    , m_columnWidthSum()
+    , m_iconRect()
+    , m_hoverPixmap()
+    , m_textRect()
+    , m_sortedVisibleRoles()
+    , m_expansionArea()
+    , m_customTextColor()
+    , m_additionalInfoTextColor()
+    , m_overlay()
+    , m_rating()
+    , m_roleEditor(nullptr)
+    , m_oldRoleEditor(nullptr)

 {
 }
 
 {
 }
 


@@ -302,6 +299,20 @@ KStandardItemListWidget::Layout KStandardItemListWidget::layout() const
     return m_layout;
 }
 
     return m_layout;
 }
 

+void KStandardItemListWidget::setHighlightEntireRow(bool highlightEntireRow)
+{
+    if (m_highlightEntireRow != highlightEntireRow) {
+        m_highlightEntireRow = highlightEntireRow;
+        m_dirtyLayout = true;
+        update();
+    }
+}
+
+bool KStandardItemListWidget::highlightEntireRow() const
+{
+    return m_highlightEntireRow;
+}
+

 void KStandardItemListWidget::setSupportsItemExpanding(bool supportsItemExpanding)
 {
     if (m_supportsItemExpanding != supportsItemExpanding) {
 void KStandardItemListWidget::setSupportsItemExpanding(bool supportsItemExpanding)
 {
     if (m_supportsItemExpanding != supportsItemExpanding) {


@@ -316,9 +327,9 @@ bool KStandardItemListWidget::supportsItemExpanding() const
     return m_supportsItemExpanding;
 }
 
     return m_supportsItemExpanding;
 }
 

-void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+void KStandardItemListWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)

 {
 {

-    const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+    const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();

 
     KItemListWidget::paint(painter, option, widget);
 
 
     KItemListWidget::paint(painter, option, widget);
 


@@ -326,8 +337,8 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
         drawSiblingsInformation(painter);
     }
 
         drawSiblingsInformation(painter);
     }
 

-    const KItemListStyleOption& itemListStyleOption = styleOption();
-    if (isHovered()) {
+    const KItemListStyleOption &itemListStyleOption = styleOption();
+    if (isHovered() && !m_pixmap.isNull()) {

         if (hoverOpacity() < 1.0) {
             /*
              * Linear interpolation between m_pixmap and m_hoverPixmap.
         if (hoverOpacity() < 1.0) {
             /*
              * Linear interpolation between m_pixmap and m_hoverPixmap.


@@ -370,13 +381,13 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
         } else {
             drawPixmap(painter, m_hoverPixmap);
         }
         } else {
             drawPixmap(painter, m_hoverPixmap);
         }

-    } else {
+    } else if (!m_pixmap.isNull()) {

         drawPixmap(painter, m_pixmap);
     }
 
     painter->setFont(m_customizedFont);
         drawPixmap(painter, m_pixmap);
     }
 
     painter->setFont(m_customizedFont);

-    painter->setPen(textColor());
-    const TextInfo* textInfo = m_textInfo.value("text");
+    painter->setPen(textColor(*widget));
+    const TextInfo *textInfo = m_textInfo.value("text");

 
     if (!textInfo) {
         // It seems that we can end up here even if m_textInfo does not contain
 
     if (!textInfo) {
         // It seems that we can end up here even if m_textInfo does not contain


@@ -406,16 +417,16 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
     painter->setFont(m_customizedFont);
 
     for (int i = 1; i < m_sortedVisibleRoles.count(); ++i) {
     painter->setFont(m_customizedFont);
 
     for (int i = 1; i < m_sortedVisibleRoles.count(); ++i) {

-        const TextInfo* textInfo = m_textInfo.value(m_sortedVisibleRoles[i]);
+        const TextInfo *textInfo = m_textInfo.value(m_sortedVisibleRoles[i]);

         painter->drawStaticText(textInfo->pos, textInfo->staticText);
     }
 
     if (!m_rating.isNull()) {
         painter->drawStaticText(textInfo->pos, textInfo->staticText);
     }
 
     if (!m_rating.isNull()) {

-        const TextInfo* ratingTextInfo = m_textInfo.value("rating");
+        const TextInfo *ratingTextInfo = m_textInfo.value("rating");

         QPointF pos = ratingTextInfo->pos;
         const Qt::Alignment align = ratingTextInfo->staticText.textOption().alignment();
         if (align & Qt::AlignHCenter) {
         QPointF pos = ratingTextInfo->pos;
         const Qt::Alignment align = ratingTextInfo->staticText.textOption().alignment();
         if (align & Qt::AlignHCenter) {

-            pos.rx() += (size().width() - m_rating.width()) / 2 - 2;
+            pos.rx() += (size().width() - m_rating.width() / m_rating.devicePixelRatioF()) / 2 - 2;

         }
         painter->drawPixmap(pos, m_rating);
     }
         }
         painter->drawPixmap(pos, m_rating);
     }


@@ -440,13 +451,13 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
 
 QRectF KStandardItemListWidget::iconRect() const
 {
 
 QRectF KStandardItemListWidget::iconRect() const
 {

-    const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+    const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();

     return m_iconRect;
 }
 
 QRectF KStandardItemListWidget::textRect() const
 {
     return m_iconRect;
 }
 
 QRectF KStandardItemListWidget::textRect() const
 {

-    const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+    const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();

     return m_textRect;
 }
 
     return m_textRect;
 }
 


@@ -457,13 +468,13 @@ QRectF KStandardItemListWidget::textFocusRect() const
     // when having a quite large icon size but only one line of text. Still the
     // focus rectangle should be shown as narrow as possible around the text.
 
     // when having a quite large icon size but only one line of text. Still the
     // focus rectangle should be shown as narrow as possible around the text.
 

-    const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+    const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();

 
     switch (m_layout) {
     case CompactLayout: {
         QRectF rect = m_textRect;
 
     switch (m_layout) {
     case CompactLayout: {
         QRectF rect = m_textRect;

-        const TextInfo* topText    = m_textInfo.value(m_sortedVisibleRoles.first());
-        const TextInfo* bottomText = m_textInfo.value(m_sortedVisibleRoles.last());
+        const TextInfo *topText = m_textInfo.value(m_sortedVisibleRoles.first());
+        const TextInfo *bottomText = m_textInfo.value(m_sortedVisibleRoles.last());

         rect.setTop(topText->pos.y());
         rect.setBottom(bottomText->pos.y() + bottomText->staticText.size().height());
         return rect;
         rect.setTop(topText->pos.y());
         rect.setBottom(bottomText->pos.y() + bottomText->staticText.size().height());
         return rect;


@@ -471,14 +482,14 @@ QRectF KStandardItemListWidget::textFocusRect() const
 
     case DetailsLayout: {
         QRectF rect = m_textRect;
 
     case DetailsLayout: {
         QRectF rect = m_textRect;

-        const TextInfo* textInfo = m_textInfo.value(m_sortedVisibleRoles.first());
+        const TextInfo *textInfo = m_textInfo.value(m_sortedVisibleRoles.first());

         rect.setTop(textInfo->pos.y());
         rect.setBottom(textInfo->pos.y() + textInfo->staticText.size().height());
 
         rect.setTop(textInfo->pos.y());
         rect.setBottom(textInfo->pos.y() + textInfo->staticText.size().height());
 

-        const KItemListStyleOption& option = styleOption();
+        const KItemListStyleOption &option = styleOption();

         if (option.extendedSelectionRegion) {
             const QString text = textInfo->staticText.text();
         if (option.extendedSelectionRegion) {
             const QString text = textInfo->staticText.text();

-            rect.setWidth(m_customizedFontMetrics.width(text) + 2 * option.padding);
+            rect.setWidth(m_customizedFontMetrics.horizontalAdvance(text) + 2 * option.padding);

         }
 
         return rect;
         }
 
         return rect;


@@ -493,7 +504,7 @@ QRectF KStandardItemListWidget::textFocusRect() const
 
 QRectF KStandardItemListWidget::selectionRect() const
 {
 
 QRectF KStandardItemListWidget::selectionRect() const
 {

-    const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+    const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();

 
     switch (m_layout) {
     case IconsLayout:
 
     switch (m_layout) {
     case IconsLayout:


@@ -503,7 +514,11 @@ QRectF KStandardItemListWidget::selectionRect() const
     case DetailsLayout: {
         const int padding = styleOption().padding;
         QRectF adjustedIconRect = iconRect().adjusted(-padding, -padding, padding, padding);
     case DetailsLayout: {
         const int padding = styleOption().padding;
         QRectF adjustedIconRect = iconRect().adjusted(-padding, -padding, padding, padding);

-        return adjustedIconRect | m_textRect;
+        QRectF result = adjustedIconRect | m_textRect;
+        if (m_highlightEntireRow) {
+            result.setRight(m_columnWidthSum + sidePadding());
+        }
+        return result;

     }
 
     default:
     }
 
     default:


@@ -516,20 +531,19 @@ QRectF KStandardItemListWidget::selectionRect() const
 
 QRectF KStandardItemListWidget::expansionToggleRect() const
 {
 
 QRectF KStandardItemListWidget::expansionToggleRect() const
 {

-    const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
+    const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();

     return m_isExpandable ? m_expansionArea : QRectF();
 }
 
 QRectF KStandardItemListWidget::selectionToggleRect() const
 {
     return m_isExpandable ? m_expansionArea : QRectF();
 }
 
 QRectF KStandardItemListWidget::selectionToggleRect() const
 {

-    const_cast<KStandardItemListWidget*>(this)->triggerCacheRefreshing();
-
-    const int iconHeight = styleOption().iconSize;
+    const_cast<KStandardItemListWidget *>(this)->triggerCacheRefreshing();

 
 

+    const int widgetIconSize = iconSize();

     int toggleSize = KIconLoader::SizeSmall;
     int toggleSize = KIconLoader::SizeSmall;

-    if (iconHeight >= KIconLoader::SizeEnormous) {
+    if (widgetIconSize >= KIconLoader::SizeEnormous) {

         toggleSize = KIconLoader::SizeMedium;
         toggleSize = KIconLoader::SizeMedium;

-    } else if (iconHeight >= KIconLoader::SizeLarge) {
+    } else if (widgetIconSize >= KIconLoader::SizeLarge) {

         toggleSize = KIconLoader::SizeSmallMedium;
     }
 
         toggleSize = KIconLoader::SizeSmallMedium;
     }
 


@@ -557,8 +571,7 @@ QRectF KStandardItemListWidget::selectionToggleRect() const
     return QRectF(pos, QSizeF(toggleSize, toggleSize));
 }
 
     return QRectF(pos, QSizeF(toggleSize, toggleSize));
 }
 

-QPixmap KStandardItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem* option,
-                                                  QWidget* widget)
+QPixmap KStandardItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem *option, QWidget *widget)

 {
     QPixmap pixmap = KItemListWidget::createDragPixmap(option, widget);
     if (m_layout != DetailsLayout) {
 {
     QPixmap pixmap = KItemListWidget::createDragPixmap(option, widget);
     if (m_layout != DetailsLayout) {


@@ -568,10 +581,8 @@ QPixmap KStandardItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem
     // Only return the content of the text-column as pixmap
     const int leftClip = m_pixmapPos.x();
 
     // Only return the content of the text-column as pixmap
     const int leftClip = m_pixmapPos.x();
 

-    const TextInfo* textInfo = m_textInfo.value("text");
-    const int rightClip = textInfo->pos.x() +
-                          textInfo->staticText.size().width() +
-                          2 * styleOption().padding;
+    const TextInfo *textInfo = m_textInfo.value("text");
+    const int rightClip = textInfo->pos.x() + textInfo->staticText.size().width() + 2 * styleOption().padding;

 
     QPixmap clippedPixmap(rightClip - leftClip + 1, pixmap.height());
     clippedPixmap.fill(Qt::transparent);
 
     QPixmap clippedPixmap(rightClip - leftClip + 1, pixmap.height());
     clippedPixmap.fill(Qt::transparent);


@@ -582,8 +593,7 @@ QPixmap KStandardItemListWidget::createDragPixmap(const QStyleOptionGraphicsItem
     return clippedPixmap;
 }
 
     return clippedPixmap;
 }
 

-
-KItemListWidgetInformant* KStandardItemListWidget::createInformant()
+KItemListWidgetInformant *KStandardItemListWidget::createInformant()

 {
     return new KStandardItemListWidgetInformant();
 }
 {
     return new KStandardItemListWidgetInformant();
 }


@@ -594,13 +604,20 @@ void KStandardItemListWidget::invalidateCache()
     m_dirtyContent = true;
 }
 
     m_dirtyContent = true;
 }
 

+void KStandardItemListWidget::invalidateIconCache()
+{
+    m_dirtyContent = true;
+    m_dirtyContentRoles.insert("iconPixmap");
+    m_dirtyContentRoles.insert("iconOverlays");
+}
+

 void KStandardItemListWidget::refreshCache()
 {
 }
 
 void KStandardItemListWidget::refreshCache()
 {
 }
 

-bool KStandardItemListWidget::isRoleRightAligned(const QByteArray& role) const
+bool KStandardItemListWidget::isRoleRightAligned(const QByteArray &role) const

 {
 {

-    Q_UNUSED(role);
+    Q_UNUSED(role)

     return false;
 }
 
     return false;
 }
 


@@ -609,7 +626,7 @@ bool KStandardItemListWidget::isHidden() const
     return false;
 }
 
     return false;
 }
 

-QFont KStandardItemListWidget::customizedFont(const QFont& baseFont) const
+QFont KStandardItemListWidget::customizedFont(const QFont &baseFont) const

 {
     return baseFont;
 }
 {
     return baseFont;
 }


@@ -619,7 +636,7 @@ QPalette::ColorRole KStandardItemListWidget::normalTextColorRole() const
     return QPalette::Text;
 }
 
     return QPalette::Text;
 }
 

-void KStandardItemListWidget::setTextColor(const QColor& color)
+void KStandardItemListWidget::setTextColor(const QColor &color)

 {
     if (color != m_customTextColor) {
         m_customTextColor = color;
 {
     if (color != m_customTextColor) {
         m_customTextColor = color;


@@ -628,7 +645,7 @@ void KStandardItemListWidget::setTextColor(const QColor& color)
     }
 }
 
     }
 }
 

-QColor KStandardItemListWidget::textColor() const
+QColor KStandardItemListWidget::textColor(const QWidget &widget) const

 {
     if (!isSelected()) {
         if (m_isHidden) {
 {
     if (!isSelected()) {
         if (m_isHidden) {


@@ -638,12 +655,12 @@ QColor KStandardItemListWidget::textColor() const
         }
     }
 
         }
     }
 

-    const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;
+    const QPalette::ColorGroup group = isActiveWindow() && widget.hasFocus() ? QPalette::Active : QPalette::Inactive;

     const QPalette::ColorRole role = isSelected() ? QPalette::HighlightedText : normalTextColorRole();
     return styleOption().palette.color(group, role);
 }
 
     const QPalette::ColorRole role = isSelected() ? QPalette::HighlightedText : normalTextColorRole();
     return styleOption().palette.color(group, role);
 }
 

-void KStandardItemListWidget::setOverlay(const QPixmap& overlay)
+void KStandardItemListWidget::setOverlay(const QPixmap &overlay)

 {
     m_overlay = overlay;
     m_dirtyContent = true;
 {
     m_overlay = overlay;
     m_dirtyContent = true;


@@ -655,30 +672,28 @@ QPixmap KStandardItemListWidget::overlay() const
     return m_overlay;
 }
 
     return m_overlay;
 }
 

-
-QString KStandardItemListWidget::roleText(const QByteArray& role,
-                                          const QHash<QByteArray, QVariant>& values) const
+QString KStandardItemListWidget::roleText(const QByteArray &role, const QHash<QByteArray, QVariant> &values) const

 {
 {

-    return static_cast<const KStandardItemListWidgetInformant*>(informant())->roleText(role, values);
+    return static_cast<const KStandardItemListWidgetInformant *>(informant())->roleText(role, values);

 }
 
 }
 

-void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current,
-                                          const QSet<QByteArray>& roles)
+void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant> &current, const QSet<QByteArray> &roles)

 {
 {

-    Q_UNUSED(current);
+    Q_UNUSED(current)

 
     m_dirtyContent = true;
 
     QSet<QByteArray> dirtyRoles;
     if (roles.isEmpty()) {
 
     m_dirtyContent = true;
 
     QSet<QByteArray> dirtyRoles;
     if (roles.isEmpty()) {

-        dirtyRoles = visibleRoles().toSet();
+        const auto visibleRoles = this->visibleRoles();
+        dirtyRoles = QSet<QByteArray>(visibleRoles.constBegin(), visibleRoles.constEnd());

     } else {
         dirtyRoles = roles;
     }
 
     // The URL might have changed (i.e., if the sort order of the items has
     // been changed). Therefore, the "is cut" state must be updated.
     } else {
         dirtyRoles = roles;
     }
 
     // The URL might have changed (i.e., if the sort order of the items has
     // been changed). Therefore, the "is cut" state must be updated.

-    KFileItemClipboard* clipboard = KFileItemClipboard::instance();
+    KFileItemClipboard *clipboard = KFileItemClipboard::instance();

     const QUrl itemUrl = data().value("url").toUrl();
     m_isCut = clipboard->isCut(itemUrl);
 
     const QUrl itemUrl = data().value("url").toUrl();
     m_isCut = clipboard->isCut(itemUrl);
 


@@ -689,76 +704,76 @@ void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& cur
 
     QSetIterator<QByteArray> it(dirtyRoles);
     while (it.hasNext()) {
 
     QSetIterator<QByteArray> it(dirtyRoles);
     while (it.hasNext()) {

-        const QByteArray& role = it.next();
+        const QByteArray &role = it.next();

         m_dirtyContentRoles.insert(role);
     }
 }
 
         m_dirtyContentRoles.insert(role);
     }
 }
 

-void KStandardItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
-                                              const QList<QByteArray>& previous)
+void KStandardItemListWidget::visibleRolesChanged(const QList<QByteArray> &current, const QList<QByteArray> &previous)

 {
 {

-    Q_UNUSED(previous);
+    Q_UNUSED(previous)

     m_sortedVisibleRoles = current;
     m_dirtyLayout = true;
 }
 
     m_sortedVisibleRoles = current;
     m_dirtyLayout = true;
 }
 

-void KStandardItemListWidget::columnWidthChanged(const QByteArray& role,
-                                             qreal current,
-                                             qreal previous)
+void KStandardItemListWidget::columnWidthChanged(const QByteArray &role, qreal current, qreal previous)
+{
+    Q_UNUSED(role)
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+    m_dirtyLayout = true;
+}
+
+void KStandardItemListWidget::sidePaddingChanged(qreal padding)

 {
 {

-    Q_UNUSED(role);
-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(padding)

     m_dirtyLayout = true;
 }
 
     m_dirtyLayout = true;
 }
 

-void KStandardItemListWidget::styleOptionChanged(const KItemListStyleOption& current,
-                                             const KItemListStyleOption& previous)
+void KStandardItemListWidget::styleOptionChanged(const KItemListStyleOption &current, const KItemListStyleOption &previous)

 {
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    KItemListWidget::styleOptionChanged(current, previous);
+

     updateAdditionalInfoTextColor();
     m_dirtyLayout = true;
 }
 
 void KStandardItemListWidget::hoveredChanged(bool hovered)
 {
     updateAdditionalInfoTextColor();
     m_dirtyLayout = true;
 }
 
 void KStandardItemListWidget::hoveredChanged(bool hovered)
 {

-    Q_UNUSED(hovered);
+    Q_UNUSED(hovered)

     m_dirtyLayout = true;
 }
 
 void KStandardItemListWidget::selectedChanged(bool selected)
 {
     m_dirtyLayout = true;
 }
 
 void KStandardItemListWidget::selectedChanged(bool selected)
 {

-    Q_UNUSED(selected);
+    Q_UNUSED(selected)

     updateAdditionalInfoTextColor();
     m_dirtyContent = true;
 }
 
     updateAdditionalInfoTextColor();
     m_dirtyContent = true;
 }
 

-void KStandardItemListWidget::siblingsInformationChanged(const QBitArray& current, const QBitArray& previous)
+void KStandardItemListWidget::siblingsInformationChanged(const QBitArray &current, const QBitArray &previous)

 {
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

     m_dirtyLayout = true;
 }
 
     m_dirtyLayout = true;
 }
 

-int KStandardItemListWidget::selectionLength(const QString& text) const
+int KStandardItemListWidget::selectionLength(const QString &text) const

 {
     return text.length();
 }
 
 {
     return text.length();
 }
 

-void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const QByteArray& previous)
+void KStandardItemListWidget::editedRoleChanged(const QByteArray &current, const QByteArray &previous)

 {
 {

-    Q_UNUSED(previous);
+    Q_UNUSED(previous)

 
 

-    QGraphicsView* parent = scene()->views()[0];
+    QGraphicsView *parent = scene()->views()[0];

     if (current.isEmpty() || !parent || current != "text") {
         if (m_roleEditor) {
     if (current.isEmpty() || !parent || current != "text") {
         if (m_roleEditor) {

-            emit roleEditingCanceled(index(), current, data().value(current));
+            Q_EMIT roleEditingCanceled(index(), current, data().value(current));

 
 

-            disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled,
-                       this, &KStandardItemListWidget::slotRoleEditingCanceled);
-            disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished,
-                       this, &KStandardItemListWidget::slotRoleEditingFinished);
+            disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled, this, &KStandardItemListWidget::slotRoleEditingCanceled);
+            disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished, this, &KStandardItemListWidget::slotRoleEditingFinished);

 
             if (m_oldRoleEditor) {
                 m_oldRoleEditor->deleteLater();
 
             if (m_oldRoleEditor) {
                 m_oldRoleEditor->deleteLater();


@@ -772,10 +787,11 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
 
     Q_ASSERT(!m_roleEditor);
 
 
     Q_ASSERT(!m_roleEditor);
 

-    const TextInfo* textInfo = m_textInfo.value("text");
+    const TextInfo *textInfo = m_textInfo.value("text");

 
     m_roleEditor = new KItemListRoleEditor(parent);
     m_roleEditor->setRole(current);
 
     m_roleEditor = new KItemListRoleEditor(parent);
     m_roleEditor->setRole(current);

+    m_roleEditor->setAllowUpDownKeyChainEdit(m_layout != IconsLayout);

     m_roleEditor->setFont(styleOption().font);
 
     const QString text = data().value(current).toString();
     m_roleEditor->setFont(styleOption().font);
 
     const QString text = data().value(current).toString();


@@ -793,10 +809,8 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
         m_roleEditor->setTextCursor(cursor);
     }
 
         m_roleEditor->setTextCursor(cursor);
     }
 

-    connect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled,
-            this, &KStandardItemListWidget::slotRoleEditingCanceled);
-    connect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished,
-            this, &KStandardItemListWidget::slotRoleEditingFinished);
+    connect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled, this, &KStandardItemListWidget::slotRoleEditingCanceled);
+    connect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished, this, &KStandardItemListWidget::slotRoleEditingFinished);

 
     // Adjust the geometry of the editor
     QRectF rect = roleEditingRect(current);
 
     // Adjust the geometry of the editor
     QRectF rect = roleEditingRect(current);


@@ -807,11 +821,21 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
         rect.setWidth(parent->width() - rect.left());
     }
     m_roleEditor->setGeometry(rect.toRect());
         rect.setWidth(parent->width() - rect.left());
     }
     m_roleEditor->setGeometry(rect.toRect());

+    m_roleEditor->autoAdjustSize();

     m_roleEditor->show();
     m_roleEditor->setFocus();
 }
 
     m_roleEditor->show();
     m_roleEditor->setFocus();
 }
 

-void KStandardItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
+void KStandardItemListWidget::iconSizeChanged(int current, int previous)
+{
+    KItemListWidget::iconSizeChanged(current, previous);
+
+    invalidateIconCache();
+    triggerCacheRefreshing();
+    update();
+}
+
+void KStandardItemListWidget::resizeEvent(QGraphicsSceneResizeEvent *event)

 {
     if (m_roleEditor) {
         setEditedRole(QByteArray());
 {
     if (m_roleEditor) {
         setEditedRole(QByteArray());


@@ -823,32 +847,29 @@ void KStandardItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
     m_dirtyLayout = true;
 }
 
     m_dirtyLayout = true;
 }
 

-void KStandardItemListWidget::showEvent(QShowEvent* event)
+void KStandardItemListWidget::showEvent(QShowEvent *event)

 {
     KItemListWidget::showEvent(event);
 
     // Listen to changes of the clipboard to mark the item as cut/uncut
 {
     KItemListWidget::showEvent(event);
 
     // Listen to changes of the clipboard to mark the item as cut/uncut

-    KFileItemClipboard* clipboard = KFileItemClipboard::instance();
+    KFileItemClipboard *clipboard = KFileItemClipboard::instance();

 
     const QUrl itemUrl = data().value("url").toUrl();
     m_isCut = clipboard->isCut(itemUrl);
 
 
     const QUrl itemUrl = data().value("url").toUrl();
     m_isCut = clipboard->isCut(itemUrl);
 

-    connect(clipboard, &KFileItemClipboard::cutItemsChanged,
-            this, &KStandardItemListWidget::slotCutItemsChanged);
+    connect(clipboard, &KFileItemClipboard::cutItemsChanged, this, &KStandardItemListWidget::slotCutItemsChanged);

 }
 
 }
 

-void KStandardItemListWidget::hideEvent(QHideEvent* event)
+void KStandardItemListWidget::hideEvent(QHideEvent *event)

 {
 {

-    disconnect(KFileItemClipboard::instance(), &KFileItemClipboard::cutItemsChanged,
-               this, &KStandardItemListWidget::slotCutItemsChanged);
+    disconnect(KFileItemClipboard::instance(), &KFileItemClipboard::cutItemsChanged, this, &KStandardItemListWidget::slotCutItemsChanged);

 
     KItemListWidget::hideEvent(event);
 }
 
 bool KStandardItemListWidget::event(QEvent *event)
 {
 
     KItemListWidget::hideEvent(event);
 }
 
 bool KStandardItemListWidget::event(QEvent *event)
 {

-    if (event->type() == QEvent::WindowDeactivate || event->type() == QEvent::WindowActivate
-            || event->type() == QEvent::PaletteChange) {
+    if (event->type() == QEvent::WindowDeactivate || event->type() == QEvent::WindowActivate || event->type() == QEvent::PaletteChange) {

         m_dirtyContent = true;
     }
 
         m_dirtyContent = true;
     }
 


@@ -874,19 +895,17 @@ void KStandardItemListWidget::slotCutItemsChanged()
     }
 }
 
     }
 }
 

-void KStandardItemListWidget::slotRoleEditingCanceled(const QByteArray& role,
-                                                      const QVariant& value)
+void KStandardItemListWidget::slotRoleEditingCanceled(const QByteArray &role, const QVariant &value)

 {
     closeRoleEditor();
 {
     closeRoleEditor();

-    emit roleEditingCanceled(index(), role, value);
+    Q_EMIT roleEditingCanceled(index(), role, value);

     setEditedRole(QByteArray());
 }
 
     setEditedRole(QByteArray());
 }
 

-void KStandardItemListWidget::slotRoleEditingFinished(const QByteArray& role,
-                                                      const QVariant& value)
+void KStandardItemListWidget::slotRoleEditingFinished(const QByteArray &role, const QVariant &value)

 {
     closeRoleEditor();
 {
     closeRoleEditor();

-    emit roleEditingFinished(index(), role, value);
+    Q_EMIT roleEditingFinished(index(), role, value);

     setEditedRole(QByteArray());
 }
 
     setEditedRole(QByteArray());
 }
 


@@ -903,10 +922,14 @@ void KStandardItemListWidget::triggerCacheRefreshing()
     m_isHidden = isHidden();
     m_customizedFont = customizedFont(styleOption().font);
     m_customizedFontMetrics = QFontMetrics(m_customizedFont);
     m_isHidden = isHidden();
     m_customizedFont = customizedFont(styleOption().font);
     m_customizedFontMetrics = QFontMetrics(m_customizedFont);

+    m_columnWidthSum = std::accumulate(m_sortedVisibleRoles.begin(), m_sortedVisibleRoles.end(), qreal(), [this](qreal sum, const auto &role) {
+        return sum + columnWidth(role);
+    });

 
     updateExpansionArea();
     updateTextsCache();
     updatePixmapCache();
 
     updateExpansionArea();
     updateTextsCache();
     updatePixmapCache();

+    clearHoverCache();

 
     m_dirtyLayout = false;
     m_dirtyContent = false;
 
     m_dirtyLayout = false;
     m_dirtyContent = false;


@@ -919,12 +942,13 @@ void KStandardItemListWidget::updateExpansionArea()
         const QHash<QByteArray, QVariant> values = data();
         const int expandedParentsCount = values.value("expandedParentsCount", 0).toInt();
         if (expandedParentsCount >= 0) {
         const QHash<QByteArray, QVariant> values = data();
         const int expandedParentsCount = values.value("expandedParentsCount", 0).toInt();
         if (expandedParentsCount >= 0) {

-            const KItemListStyleOption& option = styleOption();
+            const int widgetIconSize = iconSize();

             const qreal widgetHeight = size().height();
             const qreal widgetHeight = size().height();

-            const qreal inc = (widgetHeight - option.iconSize) / 2;
+            const qreal inc = (widgetHeight - widgetIconSize) / 2;

             const qreal x = expandedParentsCount * widgetHeight + inc;
             const qreal y = inc;
             const qreal x = expandedParentsCount * widgetHeight + inc;
             const qreal y = inc;

-            m_expansionArea = QRectF(x, y, option.iconSize, option.iconSize);
+            const qreal xPadding = m_highlightEntireRow ? sidePadding() : 0;
+            m_expansionArea = QRectF(xPadding + x, y, widgetIconSize, widgetIconSize);

             return;
         }
     }
             return;
         }
     }


@@ -939,24 +963,50 @@ void KStandardItemListWidget::updatePixmapCache()
 
     const QSizeF widgetSize = size();
     const bool iconOnTop = (m_layout == IconsLayout);
 
     const QSizeF widgetSize = size();
     const bool iconOnTop = (m_layout == IconsLayout);

-    const KItemListStyleOption& option = styleOption();
+    const KItemListStyleOption &option = styleOption();

     const qreal padding = option.padding;
 
     const qreal padding = option.padding;
 

-    const int maxIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : option.iconSize;
-    const int maxIconHeight = option.iconSize;
+    const int widgetIconSize = iconSize();
+    const int maxIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : widgetIconSize;
+    const int maxIconHeight = widgetIconSize;

 
     const QHash<QByteArray, QVariant> values = data();
 
     bool updatePixmap = (m_pixmap.width() != maxIconWidth || m_pixmap.height() != maxIconHeight);
     if (!updatePixmap && m_dirtyContent) {
 
     const QHash<QByteArray, QVariant> values = data();
 
     bool updatePixmap = (m_pixmap.width() != maxIconWidth || m_pixmap.height() != maxIconHeight);
     if (!updatePixmap && m_dirtyContent) {

-        updatePixmap = m_dirtyContentRoles.isEmpty()
-                       || m_dirtyContentRoles.contains("iconPixmap")
-                       || m_dirtyContentRoles.contains("iconName")
-                       || m_dirtyContentRoles.contains("iconOverlays");
+        updatePixmap = m_dirtyContentRoles.isEmpty() || m_dirtyContentRoles.contains("iconPixmap") || m_dirtyContentRoles.contains("iconName")
+            || m_dirtyContentRoles.contains("iconOverlays");

     }
 
     if (updatePixmap) {
     }
 
     if (updatePixmap) {

-        m_pixmap = values["iconPixmap"].value<QPixmap>();
+        m_pixmap = QPixmap();
+
+        int sequenceIndex = hoverSequenceIndex();
+
+        if (values.contains("hoverSequencePixmaps")) {
+            // Use one of the hover sequence pixmaps instead of the default
+            // icon pixmap.
+
+            const QVector<QPixmap> pixmaps = values["hoverSequencePixmaps"].value<QVector<QPixmap>>();
+
+            if (values.contains("hoverSequenceWraparoundPoint")) {
+                const float wap = values["hoverSequenceWraparoundPoint"].toFloat();
+                if (wap >= 1.0f) {
+                    sequenceIndex %= static_cast<int>(wap);
+                }
+            }
+
+            const int loadedIndex = qMax(qMin(sequenceIndex, pixmaps.size() - 1), 0);
+
+            if (loadedIndex != 0) {
+                m_pixmap = pixmaps[loadedIndex];
+            }
+        }
+
+        if (m_pixmap.isNull()) {
+            m_pixmap = values["iconPixmap"].value<QPixmap>();
+        }
+

         if (m_pixmap.isNull()) {
             // Use the icon that fits to the MIME-type
             QString iconName = values["iconName"].toString();
         if (m_pixmap.isNull()) {
             // Use the icon that fits to the MIME-type
             QString iconName = values["iconName"].toString();


@@ -966,7 +1016,11 @@ void KStandardItemListWidget::updatePixmapCache()
                 iconName = QStringLiteral("unknown");
             }
             const QStringList overlays = values["iconOverlays"].toStringList();
                 iconName = QStringLiteral("unknown");
             }
             const QStringList overlays = values["iconOverlays"].toStringList();

-            m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight, m_layout != IconsLayout && isActiveWindow() && isSelected() ? QIcon::Selected : QIcon::Normal);
+            const bool hasFocus = scene()->views()[0]->parentWidget()->hasFocus();
+            m_pixmap = pixmapForIcon(iconName,
+                                     overlays,
+                                     maxIconHeight,
+                                     m_layout != IconsLayout && isActiveWindow() && isSelected() && hasFocus ? QIcon::Selected : QIcon::Normal);

 
         } else if (m_pixmap.width() / m_pixmap.devicePixelRatio() != maxIconWidth || m_pixmap.height() / m_pixmap.devicePixelRatio() != maxIconHeight) {
             // A custom pixmap has been applied. Assure that the pixmap
 
         } else if (m_pixmap.width() / m_pixmap.devicePixelRatio() != maxIconWidth || m_pixmap.height() / m_pixmap.devicePixelRatio() != maxIconHeight) {
             // A custom pixmap has been applied. Assure that the pixmap


@@ -974,8 +1028,13 @@ void KStandardItemListWidget::updatePixmapCache()
             KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio());
         }
 
             KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio());
         }
 

+        if (m_pixmap.isNull()) {
+            m_hoverPixmap = QPixmap();
+            return;
+        }
+

         if (m_isCut) {
         if (m_isCut) {

-            KIconEffect* effect = KIconLoader::global()->iconEffect();
+            KIconEffect *effect = KIconLoader::global()->iconEffect();

             m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
         }
 
             m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
         }
 


@@ -986,6 +1045,10 @@ void KStandardItemListWidget::updatePixmapCache()
         if (m_layout == IconsLayout && isSelected()) {
             const QColor color = palette().brush(QPalette::Normal, QPalette::Highlight).color();
             QImage image = m_pixmap.toImage();
         if (m_layout == IconsLayout && isSelected()) {
             const QColor color = palette().brush(QPalette::Normal, QPalette::Highlight).color();
             QImage image = m_pixmap.toImage();

+            if (image.isNull()) {
+                m_hoverPixmap = QPixmap();
+                return;
+            }

             KIconEffect::colorize(image, color, 0.8f);
             m_pixmap = QPixmap::fromImage(image);
         }
             KIconEffect::colorize(image, color, 0.8f);
             m_pixmap = QPixmap::fromImage(image);
         }


@@ -998,13 +1061,12 @@ void KStandardItemListWidget::updatePixmapCache()
 
     int scaledIconSize = 0;
     if (iconOnTop) {
 
     int scaledIconSize = 0;
     if (iconOnTop) {

-        const TextInfo* textInfo = m_textInfo.value("text");
+        const TextInfo *textInfo = m_textInfo.value("text");

         scaledIconSize = static_cast<int>(textInfo->pos.y() - 2 * padding);
     } else {
         const int textRowsCount = (m_layout == CompactLayout) ? visibleRoles().count() : 1;
         const qreal requiredTextHeight = textRowsCount * m_customizedFontMetrics.height();
         scaledIconSize = static_cast<int>(textInfo->pos.y() - 2 * padding);
     } else {
         const int textRowsCount = (m_layout == CompactLayout) ? visibleRoles().count() : 1;
         const qreal requiredTextHeight = textRowsCount * m_customizedFontMetrics.height();

-        scaledIconSize = (requiredTextHeight < maxIconHeight) ?
-                           widgetSize.height() - 2 * padding : maxIconHeight;
+        scaledIconSize = (requiredTextHeight < maxIconHeight) ? widgetSize.height() - 2 * padding : maxIconHeight;

     }
 
     const int maxScaledIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : scaledIconSize;
     }
 
     const int maxScaledIconWidth = iconOnTop ? widgetSize.width() - 2 * padding : scaledIconSize;


@@ -1020,25 +1082,29 @@ void KStandardItemListWidget::updatePixmapCache()
         m_pixmapPos.setY(padding + scaledIconSize - m_scaledPixmapSize.height());
     } else {
         // Center horizontally and vertically within the icon-area
         m_pixmapPos.setY(padding + scaledIconSize - m_scaledPixmapSize.height());
     } else {
         // Center horizontally and vertically within the icon-area

-        const TextInfo* textInfo = m_textInfo.value("text");
-        m_pixmapPos.setX(textInfo->pos.x() - 2.0 * padding
-                      - (scaledIconSize + m_scaledPixmapSize.width()) / 2.0);
+        const TextInfo *textInfo = m_textInfo.value("text");
+        m_pixmapPos.setX(textInfo->pos.x() - 2.0 * padding - (scaledIconSize + m_scaledPixmapSize.width()) / 2.0);

 
         // Derive icon's vertical center from the center of the text frame, including
         // any necessary adjustment if the font's midline is offset from the frame center
 
         // Derive icon's vertical center from the center of the text frame, including
         // any necessary adjustment if the font's midline is offset from the frame center

-        const qreal midlineShift = m_customizedFontMetrics.height() / 2.0
-                    - m_customizedFontMetrics.descent()
-                    - m_customizedFontMetrics.capHeight() / 2.0;
+        const qreal midlineShift = m_customizedFontMetrics.height() / 2.0 - m_customizedFontMetrics.descent() - m_customizedFontMetrics.capHeight() / 2.0;

         m_pixmapPos.setY(m_textRect.center().y() + midlineShift - m_scaledPixmapSize.height() / 2.0);
         m_pixmapPos.setY(m_textRect.center().y() + midlineShift - m_scaledPixmapSize.height() / 2.0);

-

     }
 
     }
 

-    m_iconRect = QRectF(m_pixmapPos, QSizeF(m_scaledPixmapSize));
+    if (m_layout == IconsLayout) {
+        m_iconRect = QRectF(m_pixmapPos, QSizeF(m_scaledPixmapSize));
+    } else {
+        const qreal widthOffset = widgetIconSize - m_scaledPixmapSize.width();
+        const qreal heightOffset = widgetIconSize - m_scaledPixmapSize.height();
+        const QPointF squareIconPos(m_pixmapPos.x() - 0.5 * widthOffset, m_pixmapPos.y() - 0.5 * heightOffset);
+        const QSizeF squareIconSize(widgetIconSize, widgetIconSize);
+        m_iconRect = QRectF(squareIconPos, squareIconSize);
+    }

 
     // Prepare the pixmap that is used when the item gets hovered
     if (isHovered()) {
         m_hoverPixmap = m_pixmap;
 
     // Prepare the pixmap that is used when the item gets hovered
     if (isHovered()) {
         m_hoverPixmap = m_pixmap;

-        KIconEffect* effect = KIconLoader::global()->iconEffect();
+        KIconEffect *effect = KIconLoader::global()->iconEffect();

         // In the KIconLoader terminology, active = hover.
         if (effect->hasEffect(KIconLoader::Desktop, KIconLoader::ActiveState)) {
             m_hoverPixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState);
         // In the KIconLoader terminology, active = hover.
         if (effect->hasEffect(KIconLoader::Desktop, KIconLoader::ActiveState)) {
             m_hoverPixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState);


@@ -1072,7 +1138,7 @@ void KStandardItemListWidget::updateTextsCache()
     qDeleteAll(m_textInfo);
     m_textInfo.clear();
     for (int i = 0; i < m_sortedVisibleRoles.count(); ++i) {
     qDeleteAll(m_textInfo);
     m_textInfo.clear();
     for (int i = 0; i < m_sortedVisibleRoles.count(); ++i) {

-        TextInfo* textInfo = new TextInfo();
+        TextInfo *textInfo = new TextInfo();

         textInfo->staticText.setTextFormat(Qt::PlainText);
         textInfo->staticText.setPerformanceHint(QStaticText::AggressiveCaching);
         textInfo->staticText.setTextOption(textOption);
         textInfo->staticText.setTextFormat(Qt::PlainText);
         textInfo->staticText.setPerformanceHint(QStaticText::AggressiveCaching);
         textInfo->staticText.setTextOption(textOption);


@@ -1080,22 +1146,28 @@ void KStandardItemListWidget::updateTextsCache()
     }
 
     switch (m_layout) {
     }
 
     switch (m_layout) {

-    case IconsLayout:   updateIconsLayoutTextCache(); break;
-    case CompactLayout: updateCompactLayoutTextCache(); break;
-    case DetailsLayout: updateDetailsLayoutTextCache(); break;
-    default: Q_ASSERT(false); break;
+    case IconsLayout:
+        updateIconsLayoutTextCache();
+        break;
+    case CompactLayout:
+        updateCompactLayoutTextCache();
+        break;
+    case DetailsLayout:
+        updateDetailsLayoutTextCache();
+        break;
+    default:
+        Q_ASSERT(false);
+        break;

     }
 
     }
 

-    const TextInfo* ratingTextInfo = m_textInfo.value("rating");
+    const TextInfo *ratingTextInfo = m_textInfo.value("rating");

     if (ratingTextInfo) {
         // The text of the rating-role has been set to empty to get
         // replaced by a rating-image showing the rating as stars.
     if (ratingTextInfo) {
         // The text of the rating-role has been set to empty to get
         // replaced by a rating-image showing the rating as stars.

-        const KItemListStyleOption& option = styleOption();
+        const KItemListStyleOption &option = styleOption();

         QSizeF ratingSize = preferredRatingSize(option);
 
         QSizeF ratingSize = preferredRatingSize(option);
 

-        const qreal availableWidth = (m_layout == DetailsLayout)
-                                     ? columnWidth("rating") - columnPadding(option)
-                                     : size().width();
+        const qreal availableWidth = (m_layout == DetailsLayout) ? columnWidth("rating") - columnPadding(option) : size().width();

         if (ratingSize.width() > availableWidth) {
             ratingSize.rwidth() = availableWidth;
         }
         if (ratingSize.width() > availableWidth) {
             ratingSize.rwidth() = availableWidth;
         }


@@ -1113,6 +1185,37 @@ void KStandardItemListWidget::updateTextsCache()
     }
 }
 
     }
 }
 

+QString KStandardItemListWidget::elideRightKeepExtension(const QString &text, int elidingWidth) const
+{
+    const auto extensionIndex = text.lastIndexOf('.');
+    if (extensionIndex != -1) {
+        // has file extension
+        const auto extensionLength = text.length() - extensionIndex;
+        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), Qt::ElideRight, elidingWidth - extensionWidth);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            ret.append(text.rightRef(extensionLength));
+#else
+            ret.append(QStringView(text).right(extensionLength));
+#endif
+            return ret;
+        }
+    }
+    return m_customizedFontMetrics.elidedText(text, Qt::ElideRight, elidingWidth);
+}
+
+QString KStandardItemListWidget::escapeString(const QString &text) const
+{
+    QString escaped(text);
+
+    const QChar returnSymbol(0x21b5);
+    escaped.replace('\n', returnSymbol);
+
+    return escaped;
+}
+

 void KStandardItemListWidget::updateIconsLayoutTextCache()
 {
     //      +------+
 void KStandardItemListWidget::updateIconsLayoutTextCache()
 {
     //      +------+


@@ -1127,16 +1230,15 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
 
     const QHash<QByteArray, QVariant> values = data();
 
 
     const QHash<QByteArray, QVariant> values = data();
 

-    const KItemListStyleOption& option = styleOption();
+    const KItemListStyleOption &option = styleOption();

     const qreal padding = option.padding;
     const qreal maxWidth = size().width() - 2 * padding;
     const qreal padding = option.padding;
     const qreal maxWidth = size().width() - 2 * padding;

-    const qreal widgetHeight = size().height();

     const qreal lineSpacing = m_customizedFontMetrics.lineSpacing();
 
     // Initialize properties for the "text" role. It will be used as anchor
     // for initializing the position of the other roles.
     const qreal lineSpacing = m_customizedFontMetrics.lineSpacing();
 
     // Initialize properties for the "text" role. It will be used as anchor
     // for initializing the position of the other roles.

-    TextInfo* nameTextInfo = m_textInfo.value("text");
-    const QString nameText = KStringHandler::preProcessWrap(values["text"].toString());
+    TextInfo *nameTextInfo = m_textInfo.value("text");
+    const QString nameText = KStringHandler::preProcessWrap(escapeString(values["text"].toString()));

     nameTextInfo->staticText.setText(nameText);
 
     // Calculate the number of lines required for the name and the required width
     nameTextInfo->staticText.setText(nameText);
 
     // Calculate the number of lines required for the name and the required width


@@ -1164,13 +1266,11 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
                 qreal lastLineWidth;
                 do {
                     QString lastTextLine = nameText.mid(line.textStart());
                 qreal lastLineWidth;
                 do {
                     QString lastTextLine = nameText.mid(line.textStart());

-                    lastTextLine = m_customizedFontMetrics.elidedText(lastTextLine,
-                                                                      Qt::ElideRight,
-                                                                      elidingWidth);
+                    lastTextLine = elideRightKeepExtension(lastTextLine, elidingWidth);

                     const QString elidedText = nameText.left(line.textStart()) + lastTextLine;
                     nameTextInfo->staticText.setText(elidedText);
 
                     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
 
                     // We do the text eliding in a loop with decreasing width (1 px / iteration)
                     // to avoid problems related to different width calculation code paths


@@ -1186,26 +1286,19 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
     layout.endLayout();
 
     // Use one line for each additional information
     layout.endLayout();
 
     // Use one line for each additional information

-    const int additionalRolesCount = qMax(visibleRoles().count() - 1, 0);

     nameTextInfo->staticText.setTextWidth(maxWidth);
     nameTextInfo->staticText.setTextWidth(maxWidth);

-    nameTextInfo->pos = QPointF(padding, widgetHeight -
-                                         nameHeight -
-                                         additionalRolesCount * lineSpacing -
-                                         padding);
-    m_textRect = QRectF(padding + (maxWidth - nameWidth) / 2,
-                        nameTextInfo->pos.y(),
-                        nameWidth,
-                        nameHeight);
+    nameTextInfo->pos = QPointF(padding, iconSize() + 2 * padding);
+    m_textRect = QRectF(padding + (maxWidth - nameWidth) / 2, nameTextInfo->pos.y(), nameWidth, nameHeight);

 
     // Calculate the position for each additional information
     qreal y = nameTextInfo->pos.y() + nameHeight;
 
     // Calculate the position for each additional information
     qreal y = nameTextInfo->pos.y() + nameHeight;

-    foreach (const QByteArray& role, m_sortedVisibleRoles) {
+    for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {

         if (role == "text") {
             continue;
         }
 
         const QString text = roleText(role, values);
         if (role == "text") {
             continue;
         }
 
         const QString text = roleText(role, values);

-        TextInfo* textInfo = m_textInfo.value(role);
+        TextInfo *textInfo = m_textInfo.value(role);

         textInfo->staticText.setText(text);
 
         qreal requiredWidth = 0;
         textInfo->staticText.setText(text);
 
         qreal requiredWidth = 0;


@@ -1221,12 +1314,12 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
             textLine.setLineWidth(maxWidth);
             requiredWidth = textLine.naturalTextWidth();
             if (requiredWidth > maxWidth) {
             textLine.setLineWidth(maxWidth);
             requiredWidth = textLine.naturalTextWidth();
             if (requiredWidth > maxWidth) {

-                const QString elidedText = m_customizedFontMetrics.elidedText(text, Qt::ElideRight, maxWidth);
+                const QString elidedText = elideRightKeepExtension(text, maxWidth);

                 textInfo->staticText.setText(elidedText);
                 textInfo->staticText.setText(elidedText);

-                requiredWidth = m_customizedFontMetrics.width(elidedText);
+                requiredWidth = m_customizedFontMetrics.horizontalAdvance(elidedText);

             } else if (role == "rating") {
                 // Use the width of the rating pixmap, because the rating text is empty.
             } else if (role == "rating") {
                 // Use the width of the rating pixmap, because the rating text is empty.

-                requiredWidth = m_rating.width();
+                requiredWidth = m_rating.width() / m_rating.devicePixelRatioF();

             }
         }
         layout.endLayout();
             }
         }
         layout.endLayout();


@@ -1235,7 +1328,11 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
         textInfo->staticText.setTextWidth(maxWidth);
 
         const QRectF textRect(padding + (maxWidth - requiredWidth) / 2, y, requiredWidth, lineSpacing);
         textInfo->staticText.setTextWidth(maxWidth);
 
         const QRectF textRect(padding + (maxWidth - requiredWidth) / 2, y, requiredWidth, lineSpacing);

-        m_textRect |= textRect;
+
+        // Ignore empty roles. Avoids a text rect taller than the area that actually contains text.
+        if (!textRect.isEmpty()) {
+            m_textRect |= textRect;
+        }

 
         y += lineSpacing;
     }
 
         y += lineSpacing;
     }


@@ -1252,25 +1349,24 @@ void KStandardItemListWidget::updateCompactLayoutTextCache()
 
     const QHash<QByteArray, QVariant> values = data();
 
 
     const QHash<QByteArray, QVariant> values = data();
 

-    const KItemListStyleOption& option = styleOption();
+    const KItemListStyleOption &option = styleOption();

     const qreal widgetHeight = size().height();
     const qreal lineSpacing = m_customizedFontMetrics.lineSpacing();
     const qreal textLinesHeight = qMax(visibleRoles().count(), 1) * lineSpacing;
     const qreal widgetHeight = size().height();
     const qreal lineSpacing = m_customizedFontMetrics.lineSpacing();
     const qreal textLinesHeight = qMax(visibleRoles().count(), 1) * lineSpacing;

-    const int scaledIconSize = (textLinesHeight < option.iconSize) ? widgetHeight - 2 * option.padding : option.iconSize;

 
     qreal maximumRequiredTextWidth = 0;
 
     qreal maximumRequiredTextWidth = 0;

-    const qreal x = option.padding * 3 + scaledIconSize;
+    const qreal x = option.padding * 3 + iconSize();

     qreal y = qRound((widgetHeight - textLinesHeight) / 2);
     const qreal maxWidth = size().width() - x - option.padding;
     qreal y = qRound((widgetHeight - textLinesHeight) / 2);
     const qreal maxWidth = size().width() - x - option.padding;

-    foreach (const QByteArray& role, m_sortedVisibleRoles) {
-        const QString text = roleText(role, values);
-        TextInfo* textInfo = m_textInfo.value(role);
+    for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
+        const QString text = escapeString(roleText(role, values));
+        TextInfo *textInfo = m_textInfo.value(role);

         textInfo->staticText.setText(text);
 
         textInfo->staticText.setText(text);
 

-        qreal requiredWidth = m_customizedFontMetrics.width(text);
+        qreal requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);

         if (requiredWidth > maxWidth) {
             requiredWidth = maxWidth;
         if (requiredWidth > maxWidth) {
             requiredWidth = maxWidth;

-            const QString elidedText = m_customizedFontMetrics.elidedText(text, Qt::ElideRight, maxWidth);
+            const QString elidedText = elideRightKeepExtension(text, maxWidth);

             textInfo->staticText.setText(elidedText);
         }
 
             textInfo->staticText.setText(elidedText);
         }
 


@@ -1282,7 +1378,7 @@ void KStandardItemListWidget::updateCompactLayoutTextCache()
         y += lineSpacing;
     }
 
         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()
 }
 
 void KStandardItemListWidget::updateDetailsLayoutTextCache()


@@ -1295,57 +1391,54 @@ void KStandardItemListWidget::updateDetailsLayoutTextCache()
     // +------+
     m_textRect = QRectF();
 
     // +------+
     m_textRect = QRectF();
 

-    const KItemListStyleOption& option = styleOption();
+    const KItemListStyleOption &option = styleOption();

     const QHash<QByteArray, QVariant> values = data();
 
     const qreal widgetHeight = size().height();
     const QHash<QByteArray, QVariant> values = data();
 
     const qreal widgetHeight = size().height();

-    const int scaledIconSize = widgetHeight - 2 * option.padding;

     const int fontHeight = m_customizedFontMetrics.height();
 
     const qreal columnWidthInc = columnPadding(option);
     const int fontHeight = m_customizedFontMetrics.height();
 
     const qreal columnWidthInc = columnPadding(option);

-    qreal firstColumnInc = scaledIconSize;
+    qreal firstColumnInc = iconSize();

     if (m_supportsItemExpanding) {
         firstColumnInc += (m_expansionArea.left() + m_expansionArea.right() + widgetHeight) / 2;
     } else {
     if (m_supportsItemExpanding) {
         firstColumnInc += (m_expansionArea.left() + m_expansionArea.right() + widgetHeight) / 2;
     } else {

-        firstColumnInc += option.padding;
+        firstColumnInc += option.padding + sidePadding();

     }
 
     qreal x = firstColumnInc;
     const qreal y = qMax(qreal(option.padding), (widgetHeight - fontHeight) / 2);
 
     }
 
     qreal x = firstColumnInc;
     const qreal y = qMax(qreal(option.padding), (widgetHeight - fontHeight) / 2);
 

-    foreach (const QByteArray& role, m_sortedVisibleRoles) {
+    for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {

         QString text = roleText(role, values);
 
         // Elide the text in case it does not fit into the available column-width
         QString text = roleText(role, values);
 
         // Elide the text in case it does not fit into the available column-width

-        qreal requiredWidth = m_customizedFontMetrics.width(text);
+        qreal requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);

         const qreal roleWidth = columnWidth(role);
         qreal availableTextWidth = roleWidth - columnWidthInc;
 
         const bool isTextRole = (role == "text");
         if (isTextRole) {
         const qreal roleWidth = columnWidth(role);
         qreal availableTextWidth = roleWidth - columnWidthInc;
 
         const bool isTextRole = (role == "text");
         if (isTextRole) {

-            availableTextWidth -= firstColumnInc;
+            text = escapeString(text);
+            availableTextWidth -= firstColumnInc - sidePadding();

         }
 
         if (requiredWidth > availableTextWidth) {
         }
 
         if (requiredWidth > availableTextWidth) {

-            text = m_customizedFontMetrics.elidedText(text, Qt::ElideRight, availableTextWidth);
-            requiredWidth = m_customizedFontMetrics.width(text);
+            text = elideRightKeepExtension(text, availableTextWidth);
+            requiredWidth = m_customizedFontMetrics.horizontalAdvance(text);

         }
 
         }
 

-        TextInfo* textInfo = m_textInfo.value(role);
+        TextInfo *textInfo = m_textInfo.value(role);

         textInfo->staticText.setText(text);
         textInfo->pos = QPointF(x + columnWidthInc / 2, y);
         x += roleWidth;
 
         if (isTextRole) {
         textInfo->staticText.setText(text);
         textInfo->pos = QPointF(x + columnWidthInc / 2, y);
         x += roleWidth;
 
         if (isTextRole) {

-            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());
+            const qreal textWidth = option.extendedSelectionRegion ? size().width() - textInfo->pos.x() : requiredWidth + 2 * option.padding;
+            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
 
             // The column after the name should always be aligned on the same x-position independent
             // from the expansion-level shown in the name column

-            x -= firstColumnInc;
+            x -= firstColumnInc - sidePadding();

         } else if (isRoleRightAligned(role)) {
             textInfo->pos.rx() += roleWidth - requiredWidth - columnWidthInc;
         }
         } else if (isRoleRightAligned(role)) {
             textInfo->pos.rx() += roleWidth - requiredWidth - columnWidthInc;
         }


@@ -1355,10 +1448,14 @@ void KStandardItemListWidget::updateDetailsLayoutTextCache()
 void KStandardItemListWidget::updateAdditionalInfoTextColor()
 {
     QColor c1;
 void KStandardItemListWidget::updateAdditionalInfoTextColor()
 {
     QColor c1;

+    const bool hasFocus = scene()->views()[0]->parentWidget()->hasFocus();

     if (m_customTextColor.isValid()) {
         c1 = m_customTextColor;
     if (m_customTextColor.isValid()) {
         c1 = m_customTextColor;

-    } else if (isSelected() && m_layout != DetailsLayout) {
-        c1 = styleOption().palette.highlightedText().color();
+    } else if (isSelected() && hasFocus && (m_layout != DetailsLayout || m_highlightEntireRow)) {
+        // The detail text colour needs to match the main text (HighlightedText) for the same level
+        // of readability. We short circuit early here to avoid interpolating with another colour.
+        m_additionalInfoTextColor = styleOption().palette.color(QPalette::HighlightedText);
+        return;

     } else {
         c1 = styleOption().palette.text().color();
     }
     } else {
         c1 = styleOption().palette.text().color();
     }


@@ -1369,12 +1466,11 @@ void KStandardItemListWidget::updateAdditionalInfoTextColor()
     const QColor c2 = styleOption().palette.base().color();
     const int p1 = 70;
     const int p2 = 100 - p1;
     const QColor c2 = styleOption().palette.base().color();
     const int p1 = 70;
     const int p2 = 100 - p1;

-    m_additionalInfoTextColor = QColor((c1.red()   * p1 + c2.red()   * p2) / 100,
-                                       (c1.green() * p1 + c2.green() * p2) / 100,
-                                       (c1.blue()  * p1 + c2.blue()  * p2) / 100);
+    m_additionalInfoTextColor =
+        QColor((c1.red() * p1 + c2.red() * p2) / 100, (c1.green() * p1 + c2.green() * p2) / 100, (c1.blue() * p1 + c2.blue() * p2) / 100);

 }
 
 }
 

-void KStandardItemListWidget::drawPixmap(QPainter* painter, const QPixmap& pixmap)
+void KStandardItemListWidget::drawPixmap(QPainter *painter, const QPixmap &pixmap)

 {
     if (m_scaledPixmapSize != pixmap.size() / pixmap.devicePixelRatio()) {
         QPixmap scaledPixmap = pixmap;
 {
     if (m_scaledPixmapSize != pixmap.size() / pixmap.devicePixelRatio()) {
         QPixmap scaledPixmap = pixmap;


@@ -1391,21 +1487,21 @@ void KStandardItemListWidget::drawPixmap(QPainter* painter, const QPixmap& pixma
     }
 }
 
     }
 }
 

-void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
+void KStandardItemListWidget::drawSiblingsInformation(QPainter *painter)

 {
     const int siblingSize = size().height();
     const int x = (m_expansionArea.left() + m_expansionArea.right() - siblingSize) / 2;
     QRect siblingRect(x, 0, siblingSize, siblingSize);
 
 {
     const int siblingSize = size().height();
     const int x = (m_expansionArea.left() + m_expansionArea.right() - siblingSize) / 2;
     QRect siblingRect(x, 0, siblingSize, siblingSize);
 

-    QStyleOption option;
-    option.palette.setColor(QPalette::Text, option.palette.color(normalTextColorRole()));

     bool isItemSibling = true;
 
     const QBitArray siblings = siblingsInformation();
     bool isItemSibling = true;
 
     const QBitArray siblings = siblingsInformation();

+    QStyleOption option;
+    const auto normalColor = option.palette.color(normalTextColorRole());
+    const auto highlightColor = option.palette.color(expansionAreaHovered() ? QPalette::Highlight : normalTextColorRole());

     for (int i = siblings.count() - 1; i >= 0; --i) {
         option.rect = siblingRect;
         option.state = siblings.at(i) ? QStyle::State_Sibling : QStyle::State_None;
     for (int i = siblings.count() - 1; i >= 0; --i) {
         option.rect = siblingRect;
         option.state = siblings.at(i) ? QStyle::State_Sibling : QStyle::State_None;

-

         if (isItemSibling) {
             option.state |= QStyle::State_Item;
             if (m_isExpandable) {
         if (isItemSibling) {
             option.state |= QStyle::State_Item;
             if (m_isExpandable) {


@@ -1414,7 +1510,10 @@ void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
             if (data().value("isExpanded").toBool()) {
                 option.state |= QStyle::State_Open;
             }
             if (data().value("isExpanded").toBool()) {
                 option.state |= QStyle::State_Open;
             }

+            option.palette.setColor(QPalette::Text, highlightColor);

             isItemSibling = false;
             isItemSibling = false;

+        } else {
+            option.palette.setColor(QPalette::Text, normalColor);

         }
 
         style()->drawPrimitive(QStyle::PE_IndicatorBranch, &option, painter);
         }
 
         style()->drawPrimitive(QStyle::PE_IndicatorBranch, &option, painter);


@@ -1423,9 +1522,9 @@ void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
     }
 }
 
     }
 }
 

-QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
+QRectF KStandardItemListWidget::roleEditingRect(const QByteArray &role) const

 {
 {

-    const TextInfo* textInfo = m_textInfo.value(role);
+    const TextInfo *textInfo = m_textInfo.value(role);

     if (!textInfo) {
         return QRectF();
     }
     if (!textInfo) {
         return QRectF();
     }


@@ -1440,10 +1539,8 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
 
 void KStandardItemListWidget::closeRoleEditor()
 {
 
 void KStandardItemListWidget::closeRoleEditor()
 {

-    disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled,
-               this, &KStandardItemListWidget::slotRoleEditingCanceled);
-    disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished,
-               this, &KStandardItemListWidget::slotRoleEditingFinished);
+    disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled, this, &KStandardItemListWidget::slotRoleEditingCanceled);
+    disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingFinished, this, &KStandardItemListWidget::slotRoleEditingFinished);

 
     if (m_roleEditor->hasFocus()) {
         // If the editing was not ended by a FocusOut event, we have
 
     if (m_roleEditor->hasFocus()) {
         // If the editing was not ended by a FocusOut event, we have


@@ -1459,37 +1556,31 @@ void KStandardItemListWidget::closeRoleEditor()
     m_roleEditor = nullptr;
 }
 
     m_roleEditor = nullptr;
 }
 

-QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size, QIcon::Mode mode)
+QPixmap KStandardItemListWidget::pixmapForIcon(const QString &name, const QStringList &overlays, int size, QIcon::Mode mode) const

 {
     static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown"));
 {
     static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown"));

+    qreal dpr = qApp->devicePixelRatio();
+    if (scene() && !scene()->views().isEmpty()) {
+        dpr = scene()->views().constFirst()->devicePixelRatioF();
+    }
+
+    size *= dpr;

 
 

-    int requestedSize = size;
-    if (size <= KIconLoader::SizeSmall) {
-        requestedSize = KIconLoader::SizeSmall;
-    } else if (size <= KIconLoader::SizeSmallMedium) {
-        requestedSize = KIconLoader::SizeSmallMedium;
-    } else if (size <= KIconLoader::SizeMedium) {
-        requestedSize = KIconLoader::SizeMedium;
-    } else if (size <= KIconLoader::SizeLarge) {
-        requestedSize = KIconLoader::SizeLarge;
-    } else if (size <= KIconLoader::SizeHuge) {
-        requestedSize = KIconLoader::SizeHuge;
-    } else if (size <= KIconLoader::SizeEnormous) {
-        requestedSize = KIconLoader::SizeEnormous;
-    } else if (size <= KIconLoader::SizeEnormous * 2) {
-        requestedSize = KIconLoader::SizeEnormous * 2;
-    }
-    size *= qApp->devicePixelRatio();
-    requestedSize *= qApp->devicePixelRatio();
-
-    const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size) % ":" % QString::number(mode);
+    const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QLatin1Char(':')) % ":" % QString::number(size) % "@" % QString::number(dpr)
+        % ":" % QString::number(mode);

     QPixmap pixmap;
 
     QPixmap pixmap;
 

-    if (!QPixmapCache::find(key, pixmap)) {
-        const QIcon icon = QIcon::fromTheme(name, fallbackIcon);
+    if (!QPixmapCache::find(key, &pixmap)) {
+        QIcon icon = QIcon::fromTheme(name);
+        if (icon.isNull()) {
+            icon = QIcon(name);
+        }
+        if (icon.isNull() || icon.pixmap(size / dpr, size / dpr, mode).isNull()) {
+            icon = fallbackIcon;
+        }

 
 

-        pixmap = icon.pixmap(requestedSize / qApp->devicePixelRatio(), requestedSize / qApp->devicePixelRatio(), mode);
-        if (requestedSize != size) {
+        pixmap = icon.pixmap(QSize(size / dpr, size / dpr), dpr, mode);
+        if (pixmap.width() != size || pixmap.height() != size) {

             KPixmapModifier::scale(pixmap, QSize(size, size));
         }
 
             KPixmapModifier::scale(pixmap, QSize(size, size));
         }
 


@@ -1498,7 +1589,7 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
         // It is more efficient to do it here, as KIconLoader::drawOverlays()
         // assumes that an overlay will be drawn and has some additional
         // setup time.
         // It is more efficient to do it here, as KIconLoader::drawOverlays()
         // assumes that an overlay will be drawn and has some additional
         // setup time.

-        foreach (const QString& overlay, overlays) {
+        for (const QString &overlay : overlays) {

             if (!overlay.isEmpty()) {
                 int state = KIconLoader::DefaultState;
 
             if (!overlay.isEmpty()) {
                 int state = KIconLoader::DefaultState;
 


@@ -1525,19 +1616,20 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
 
         QPixmapCache::insert(key, pixmap);
     }
 
         QPixmapCache::insert(key, pixmap);
     }

-    pixmap.setDevicePixelRatio(qApp->devicePixelRatio());
+    pixmap.setDevicePixelRatio(dpr);

 
     return pixmap;
 }
 
 
     return pixmap;
 }
 

-QSizeF KStandardItemListWidget::preferredRatingSize(const KItemListStyleOption& option)
+QSizeF KStandardItemListWidget::preferredRatingSize(const KItemListStyleOption &option)

 {
     const qreal height = option.fontMetrics.ascent();
     return QSizeF(height * 5, height);
 }
 
 {
     const qreal height = option.fontMetrics.ascent();
     return QSizeF(height * 5, height);
 }
 

-qreal KStandardItemListWidget::columnPadding(const KItemListStyleOption& option)
+qreal KStandardItemListWidget::columnPadding(const KItemListStyleOption &option)

 {
     return option.padding * 6;
 }
 
 {
     return option.padding * 6;
 }
 

+#include "moc_kstandarditemlistwidget.cpp"