Port from KIconLoader::drawOverlays to KIconUtils::addOverlays

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

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index d2806082afc7f56ceb4d24d21f6981011a4247ff..c8a6955b9406c990ce51801476482b349db9a469 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -15,6 +15,7 @@
 
 #include <KIconEffect>
 #include <KIconLoader>
 
 #include <KIconEffect>
 #include <KIconLoader>

+#include <KIconUtils>

 #include <KRatingPainter>
 #include <KStringHandler>
 
 #include <KRatingPainter>
 #include <KStringHandler>
 


@@ -1088,8 +1089,14 @@ void KStandardItemListWidget::updatePixmapCache()
         }
 
         if (m_isCut) {
         }
 
         if (m_isCut) {

-            KIconEffect *effect = KIconLoader::global()->iconEffect();
-            m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
+#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+            KIconEffect::toDisabled(m_pixmap);
+#else
+            QImage img = m_pixmap.toImage();
+            KIconEffect::toGray(img, 1);
+            KIconEffect::semiTransparent(img);
+            m_pixmap = QPixmap::fromImage(img);
+#endif

         }
 
         if (m_isHidden) {
         }
 
         if (m_isHidden) {


@@ -1162,13 +1169,13 @@ void KStandardItemListWidget::updatePixmapCache()
     // 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();
-        // In the KIconLoader terminology, active = hover.
-        if (effect->hasEffect(KIconLoader::Desktop, KIconLoader::ActiveState)) {
-            m_hoverPixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState);
-        } else {
-            m_hoverPixmap = m_pixmap;
-        }
+#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+        KIconEffect::toActive(m_hoverPixmap);
+#else
+        QImage img = m_pixmap.toImage();
+        KIconEffect::toGamma(img, 0.7);
+        m_hoverPixmap = QPixmap::fromImage(img);
+#endif

     } else if (hoverOpacity() <= 0.0) {
         // No hover animation is ongoing. Clear m_hoverPixmap to save memory.
         m_hoverPixmap = QPixmap();
     } else if (hoverOpacity() <= 0.0) {
         // No hover animation is ongoing. Clear m_hoverPixmap to save memory.
         m_hoverPixmap = QPixmap();


@@ -1256,11 +1263,7 @@ QString KStandardItemListWidget::elideRightKeepExtension(const QString &text, in
         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 (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));
             ret.append(QStringView(text).right(extensionLength));

-#endif

             return ret;
         }
     }
             return ret;
         }
     }


@@ -1645,30 +1648,12 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString &name, const QStrin
 
         // Strangely KFileItem::overlays() returns empty string-values, so
         // we need to check first whether an overlay must be drawn at all.
 
         // Strangely KFileItem::overlays() returns empty string-values, so
         // we need to check first whether an overlay must be drawn at all.

-        // It is more efficient to do it here, as KIconLoader::drawOverlays()
-        // assumes that an overlay will be drawn and has some additional
-        // setup time.

         for (const QString &overlay : overlays) {
             if (!overlay.isEmpty()) {
         for (const QString &overlay : overlays) {
             if (!overlay.isEmpty()) {

-                int state = KIconLoader::DefaultState;
-
-                switch (mode) {
-                case QIcon::Normal:
-                    break;
-                case QIcon::Active:
-                    state = KIconLoader::ActiveState;
-                    break;
-                case QIcon::Disabled:
-                    state = KIconLoader::DisabledState;
-                    break;
-                case QIcon::Selected:
-                    state = KIconLoader::SelectedState;
-                    break;
-                }
-

                 // There is at least one overlay, draw all overlays above m_pixmap
                 // and cancel the check
                 // There is at least one overlay, draw all overlays above m_pixmap
                 // and cancel the check

-                KIconLoader::global()->drawOverlays(overlays, pixmap, KIconLoader::Desktop, state);
+                const QSize size = pixmap.size();
+                pixmap = KIconUtils::addOverlays(pixmap, overlays).pixmap(size, mode);

                 break;
             }
         }
                 break;
             }
         }