Cleanup unused colors. Use const. Use KColorScheme danger.

The draw code is more like the last state of D21312 now.

diff --git a/src/panels/places/placesitemlistwidget.cpp b/src/panels/places/placesitemlistwidget.cpp
index 4be7ac021ae0e8b8dda4ef36802f12a53efa1ff9..2f1ac5909b301c94bc1d79a5024b6d650afd9d2b 100644 (file)
--- a/src/panels/places/placesitemlistwidget.cpp
+++ b/src/panels/places/placesitemlistwidget.cpp
@@ -6,15 +6,17 @@
 
 #include "placesitemlistwidget.h"
 
 
 #include "placesitemlistwidget.h"
 

-#include <QDebug>
+// #include <QDebug>

 
 #include <QDateTime>
 #include <QGraphicsView>
 #include <QStyleOption>
 
 
 #include <QDateTime>
 #include <QGraphicsView>
 #include <QStyleOption>
 

-#include <KIO/FileSystemFreeSpaceJob>
+#include <KColorScheme>

 #include <KMountPoint>
 
 #include <KMountPoint>
 

+#include <KIO/FileSystemFreeSpaceJob>
+

 #define CAPACITYBAR_HEIGHT 2
 #define CAPACITYBAR_MARGIN 2
 
 #define CAPACITYBAR_HEIGHT 2
 #define CAPACITYBAR_MARGIN 2
 


@@ -110,7 +112,7 @@ void PlacesItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsIt
         if (textInfo) { // See KStandarItemListWidget::paint() for info on why we check textInfo.
             painter->save();
 
         if (textInfo) { // See KStandarItemListWidget::paint() for info on why we check textInfo.
             painter->save();
 

-            QRect capacityRect(
+            const QRect capacityRect(

                 textInfo->pos.x(),
                 option->rect.top() + option->rect.height() - CAPACITYBAR_HEIGHT - CAPACITYBAR_MARGIN,
                 qMin((qreal)option->rect.width(), selectionRect().width()) - (textInfo->pos.x() - option->rect.left()),
                 textInfo->pos.x(),
                 option->rect.top() + option->rect.height() - CAPACITYBAR_HEIGHT - CAPACITYBAR_MARGIN,
                 qMin((qreal)option->rect.width(), selectionRect().width()) - (textInfo->pos.x() - option->rect.left()),


@@ -119,42 +121,23 @@ void PlacesItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsIt
 
             const QPalette pal = palette();
             const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;
 
             const QPalette pal = palette();
             const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;

-            // QColor bgColor = QColor::fromRgb(230, 230, 230);
-            // QColor outlineColor = QColor::fromRgb(208, 208, 208);
-            // QColor bgColor = QColor::fromRgb(0, 230, 0);
-            // QColor outlineColor = QColor::fromRgb(208, 0, 0, 127);
-            // QColor normalUsedColor = QColor::fromRgb(38, 160, 218);
-            // QColor dangerUsedColor = QColor::fromRgb(218, 38, 38);
-            // QColor bgColor = pal.base().color().darker(130);
-            // QColor outlineColor = pal.base().color().darker(150);
-
-            QPalette::ColorRole role;
-            // role = isSelected() ? QPalette::Highlight : QPalette::Window;
-            // QColor bgColor = styleOption().palette.color(group, role).darker(150);
-            // QColor outlineColor = styleOption().palette.color(group, role).darker(170);
-            QColor bgColor = isSelected()
-                ? styleOption().palette.color(group, QPalette::Highlight).darker(180)
-                : styleOption().palette.color(group, QPalette::Window).darker(120);
-
-            role = isSelected() ? QPalette::HighlightedText : QPalette::Highlight;
-            QColor normalUsedColor = styleOption().palette.color(group, role);
-
-            QColor dangerUsedColor = QColor::fromRgb(218, 38, 38);

 
             // Background
 
             // Background

-            painter->fillRect(capacityRect, bgColor);
+            const QColor bgColor = isSelected()
+                ? pal.color(group, QPalette::Highlight).darker(180)
+                : pal.color(group, QPalette::Window).darker(120);

 
 

-            // Outline
-            // const QRect outlineRect(capacityRect.x(), capacityRect.y(), capacityRect.width() - 1, capacityRect.height() - 1);
-            // painter->setPen(outlineColor);
-            // painter->drawRect(outlineRect);
+            painter->fillRect(capacityRect, bgColor);

 
             // Fill
             const QRect fillRect(capacityRect.x(), capacityRect.y(), capacityRect.width() * m_freeSpaceInfo.usedRatio, capacityRect.height());
 
             // Fill
             const QRect fillRect(capacityRect.x(), capacityRect.y(), capacityRect.width() * m_freeSpaceInfo.usedRatio, capacityRect.height());

-            if (m_freeSpaceInfo.usedRatio < 0.95) { // Fill
-                painter->fillRect(fillRect, normalUsedColor);
-            } else {
+            if (m_freeSpaceInfo.usedRatio >= 0.95) { // More than 95% full!
+                const QColor dangerUsedColor = KColorScheme(group, KColorScheme::View).foreground(KColorScheme::NegativeText).color();

                 painter->fillRect(fillRect, dangerUsedColor);
                 painter->fillRect(fillRect, dangerUsedColor);

+            } else {
+                const QPalette::ColorRole role = isSelected() ? QPalette::HighlightedText : QPalette::Highlight;
+                const QColor normalUsedColor = styleOption().palette.color(group, role);
+                painter->fillRect(fillRect, normalUsedColor);

             }
 
             painter->restore();
             }
 
             painter->restore();