From 5335188e635c8c1b1cb2529e2a921d15c7d02058 Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Tue, 11 Dec 2018 14:47:50 -0600
Subject: Add option to remove column colors for mod list separators

---
 src/modlist.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/modlist.cpp')

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 547cc853..dfe2efd3 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -395,7 +395,6 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
     return QVariant();
   } else if ((role == Qt::BackgroundRole)
              || (role == ViewMarkingScrollBar::DEFAULT_ROLE)) {
-    auto flags = modInfo->getFlags();
     if (modInfo->getHighlight() & ModInfo::HIGHLIGHT_PLUGIN) {
       return Settings::instance().modlistContainsPluginColor();
     } else if (m_Overwrite.find(modIndex) != m_Overwrite.end()) {
@@ -403,8 +402,11 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
     }
     else if (m_Overwritten.find(modIndex) != m_Overwritten.end()) {
       return Settings::instance().modlistOverwritingLooseColor();
-    } else if (std::find(flags.begin(), flags.end(), ModInfo::FLAG_SEPARATOR) != flags.end() && modInfo->getColor().isValid()) {
-        return modInfo->getColor();
+    } else if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR)
+               && modInfo->getColor().isValid()
+               && ((role != ViewMarkingScrollBar::DEFAULT_ROLE)
+                    || Settings::instance().colorSeparatorScrollbar())) {
+      return modInfo->getColor();
     } else {
       return QVariant();
     }
-- 
cgit v1.3.1