Torrent state text always neutral (black or grey).

--HG-- branch : magao-dev
qbittorrent · Feb 8, 2017 · 4a571de · zeule · Feb 9, 2017 · 4a571de
1 parent beb94e9
commit 4a571de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/gui/guiiconprovider.cpp b/src/gui/guiiconprovider.cpp
@@ -218,7 +218,7 @@ QIcon GuiIconProvider::getStatusIcon(const QString &iconId, const BitTorrent::To
 
     if (!ignoreState) {
         QPixmap colored(pixmap.size());
-        colored.fill(TorrentModel::getColorByState(state));
+        colored.fill(TorrentModel::getIconColorByState(state));
         colored.setMask(pixmap.createMaskFromColor(Qt::transparent));
         pixmap = colored;
     }

diff --git a/src/gui/torrentmodel.cpp b/src/gui/torrentmodel.cpp
@@ -371,6 +371,18 @@ static const QColor steelBlue3(79, 148, 205);
 static const QColor teal(0, 128, 128);
 
 QColor TorrentModel::getColorByState(const BitTorrent::TorrentState &state)
+{
+    Q_UNUSED(state);
+
+    bool dark = GuiIconProvider::instance()->getThemeFlags() & GuiIconProvider::DarkTheme;
+
+    if (!dark)
+        return black;
+    else
+        return gray80;
+}
+
+QColor TorrentModel::getIconColorByState(const BitTorrent::TorrentState &state)
 {
     bool dark = GuiIconProvider::instance()->getThemeFlags() & GuiIconProvider::DarkTheme;
 

diff --git a/src/gui/torrentmodel.h b/src/gui/torrentmodel.h
@@ -100,6 +100,7 @@ class TorrentModel: public QAbstractListModel
     BitTorrent::TorrentHandle *torrentHandle(const QModelIndex &index) const;
 
     static QIcon getIconByState(const BitTorrent::TorrentState &state);
+    static QColor getIconColorByState(const BitTorrent::TorrentState &state);
     static QColor getColorByState(const BitTorrent::TorrentState &state);
 
 private slots: