diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2018-12-11 14:47:50 -0600 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-11 14:47:50 -0600 |
| commit | 5335188e635c8c1b1cb2529e2a921d15c7d02058 (patch) | |
| tree | e3197f2e16c7946fbf44637e0e748202db95716a /src/modlist.cpp | |
| parent | dac716bb86a9e4ff514fe7d939f33b397dc120e5 (diff) | |
Add option to remove column colors for mod list separators
Diffstat (limited to 'src/modlist.cpp')
| -rw-r--r-- | src/modlist.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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();
}
|