From: Nicolas Fella Date: Tue, 16 Jul 2024 22:03:52 +0000 (+0200) Subject: Port away from deprecated KIconEffect API X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/38ab14c87a945153e683657483fa4bcf44d6b0fb Port away from deprecated KIconEffect API --- diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index cddd43330..e3e925c03 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -1088,8 +1088,14 @@ void KStandardItemListWidget::updatePixmapCache() } 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) { @@ -1162,13 +1168,13 @@ void KStandardItemListWidget::updatePixmapCache() // 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(); diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 86a569a86..70d85a402 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -411,8 +411,15 @@ void InformationPanelContent::markOutdatedPreview() // use it until the preview is done showIcon(m_item); } else { - KIconEffect *iconEffect = KIconLoader::global()->iconEffect(); - QPixmap disabledPixmap = iconEffect->apply(m_preview->pixmap(), KIconLoader::Desktop, KIconLoader::DisabledState); +#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0) + QPixmap disabledPixmap = m_preview->pixmap(); + KIconEffect::toDisabled(disabledPixmap); +#else + QImage img = m_preview->pixmap().toImage(); + KIconEffect::toGray(img, 1); + KIconEffect::semiTransparent(img); + QPixmap disabledPixmap = QPixmap::fromImage(img); +#endif m_preview->setPixmap(disabledPixmap); } }