X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ed2d352c42a6d517d4f29b3582c0e00aa34fe647..bd839796f1e165016f8a4dfd01b222b31fb7773f:/src/views/dolphinfileitemlistwidget.cpp diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp index 921baf73f..7ad242f3f 100644 --- a/src/views/dolphinfileitemlistwidget.cpp +++ b/src/views/dolphinfileitemlistwidget.cpp @@ -5,6 +5,7 @@ */ #include "dolphinfileitemlistwidget.h" +#include "../kitemviews/private/kitemviewsutils.h" #include "dolphindebug.h" @@ -23,6 +24,7 @@ void DolphinFileItemListWidget::refreshCache() { QColor color; const QHash values = data(); + QHash overlays; if (values.contains("version")) { // The item is under version control. Apply the text color corresponding // to its version state. @@ -69,27 +71,28 @@ void DolphinFileItemListWidget::refreshCache() (tintColor.blue() + textColor.blue()) / 2, (tintColor.alpha() + textColor.alpha()) / 2); - setOverlay(overlayForState(version, styleOption().iconSize)); - } else if (!overlay().isNull()) { - setOverlay(QPixmap()); + overlays.insert(Qt::Corner::BottomLeftCorner, overlayForState(version)); } + if (values.contains("iconOverlays")) { + const auto corners = {Qt::Corner::BottomRightCorner, Qt::Corner::TopLeftCorner, Qt::Corner::TopRightCorner}; + const auto iconOverlays = values.value("iconOverlays").toStringList(); + auto overlaysIt = iconOverlays.constBegin(); + for (const auto &corner : corners) { + if (overlaysIt == iconOverlays.constEnd()) { + break; + } + overlays.insert(corner, *overlaysIt); + overlaysIt = ++overlaysIt; + } + } + + setOverlays(overlays); setTextColor(color); } -QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version, int size) +QString DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version) const { - int overlayHeight = KIconLoader::SizeSmall; - if (size >= KIconLoader::SizeEnormous) { - overlayHeight = KIconLoader::SizeMedium; - } else if (size >= KIconLoader::SizeLarge) { - overlayHeight = KIconLoader::SizeSmallMedium; - } else if (size >= KIconLoader::SizeMedium) { - overlayHeight = KIconLoader::SizeSmall; - } else { - overlayHeight = KIconLoader::SizeSmall / 2; - } - QString iconName; switch (version) { case KVersionControlPlugin::NormalVersion: @@ -122,7 +125,7 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe break; } - return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight)); + return iconName; } #include "moc_dolphinfileitemlistwidget.cpp"