ViewProperties: Return nullptr if viewPropertiesString is empty

[dolphin.git] / src / views / dolphinfileitemlistwidget.cpp

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index c3a15ea6f4e023b38e27b5dcf01eadf4c3cded4e..11c88d402ec176be1d1ba340492855d3f4c92d7b 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -5,14 +5,14 @@
  */
 
 #include "dolphinfileitemlistwidget.h"
+#include "../kitemviews/private/kitemviewsutils.h"
 
 #include "dolphindebug.h"
 
 #include <KIconLoader>
 
-DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant,
-                                                     QGraphicsItem* parent) :
-    KFileItemListWidget(informant, parent)
+DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent)
+    : KFileItemListWidget(informant, parent)
 {
 }
 
@@ -35,23 +35,39 @@ void DolphinFileItemListWidget::refreshCache()
         // as tint colors and are mixed with the current set text color. The tint colors
         // have been optimized for the base colors of the corresponding Oxygen emblems.
         switch (version) {
-        case KVersionControlPlugin::UpdateRequiredVersion:          tintColor = Qt::yellow; break;
-        case KVersionControlPlugin::LocallyModifiedUnstagedVersion: tintColor = Qt::green; break;
-        case KVersionControlPlugin::LocallyModifiedVersion:         tintColor = Qt::green; break;
-        case KVersionControlPlugin::AddedVersion:                   tintColor = Qt::green; break;
-        case KVersionControlPlugin::RemovedVersion:                 tintColor = Qt::darkRed; break;
-        case KVersionControlPlugin::ConflictingVersion:             tintColor = Qt::red; break;
-        case KVersionControlPlugin::IgnoredVersion:                 tintColor = Qt::white; break;
-        case KVersionControlPlugin::MissingVersion:                 tintColor = Qt::red; break;
+        case KVersionControlPlugin::UpdateRequiredVersion:
+            tintColor = Qt::yellow;
+            break;
+        case KVersionControlPlugin::LocallyModifiedUnstagedVersion:
+            tintColor = Qt::green;
+            break;
+        case KVersionControlPlugin::LocallyModifiedVersion:
+            tintColor = Qt::green;
+            break;
+        case KVersionControlPlugin::AddedVersion:
+            tintColor = Qt::green;
+            break;
+        case KVersionControlPlugin::RemovedVersion:
+            tintColor = Qt::darkRed;
+            break;
+        case KVersionControlPlugin::ConflictingVersion:
+            tintColor = Qt::red;
+            break;
+        case KVersionControlPlugin::IgnoredVersion:
+            tintColor = Qt::white;
+            break;
+        case KVersionControlPlugin::MissingVersion:
+            tintColor = Qt::red;
+            break;
         case KVersionControlPlugin::NormalVersion:
         case KVersionControlPlugin::UnversionedVersion:
         default:
             break;
         }
 
-        color = QColor((tintColor.red()   + textColor.red())   / 2,
+        color = QColor((tintColor.red() + textColor.red()) / 2,
                        (tintColor.green() + textColor.green()) / 2,
-                       (tintColor.blue()  + textColor.blue())  / 2,
+                       (tintColor.blue() + textColor.blue()) / 2,
                        (tintColor.alpha() + textColor.alpha()) / 2);
 
         setOverlay(overlayForState(version, styleOption().iconSize));
@@ -62,7 +78,7 @@ void DolphinFileItemListWidget::refreshCache()
     setTextColor(color);
 }
 
-QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version, int size)
+QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version, int size) const
 {
     int overlayHeight = KIconLoader::SizeSmall;
     if (size >= KIconLoader::SizeEnormous) {
@@ -107,6 +123,8 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVe
         break;
     }
 
-    return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
+    const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
+    return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight), dpr);
 }
 
+#include "moc_dolphinfileitemlistwidget.cpp"