diff options
| author | Al <26797547+Al12rs@users.noreply.github.com> | 2020-04-30 15:57:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 15:57:42 +0200 |
| commit | 4b265a5cd381168f73c156227c473a0ac55bb476 (patch) | |
| tree | c9845642b6f048fa80edbc38285d78ee3bf0c3fa /src/modlist.cpp | |
| parent | 9945beabf160c68852a8bdac07de255f04fd6886 (diff) | |
| parent | bdd1e97d4f3a8b294a0691a7631c60cf24fffa90 (diff) | |
Merge pull request #1063 from Al12rs/mod_colors
Mod colors
Diffstat (limited to 'src/modlist.cpp')
| -rw-r--r-- | src/modlist.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modlist.cpp b/src/modlist.cpp index fb3dde13..4afd2a25 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -404,7 +404,7 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const } return QVariant(); } else if (role == Qt::ForegroundRole) { - if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR) && modInfo->getColor().isValid()) { + if (modInfo->hasFlag(ModInfo::FLAG_SEPARATOR) || (column == COL_NOTES) && modInfo->getColor().isValid()) { return ColorSettings::idealTextColor(modInfo->getColor()); } else if (column == COL_NAME) { int highlight = modInfo->getHighlight(); @@ -430,7 +430,9 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const bool overwritten = m_Overwritten.find(modIndex) != m_Overwritten.end(); bool archiveOverwritten = m_ArchiveOverwritten.find(modIndex) != m_ArchiveOverwritten.end(); bool archiveLooseOverwritten = m_ArchiveLooseOverwritten.find(modIndex) != m_ArchiveLooseOverwritten.end(); - if (modInfo->getHighlight() & ModInfo::HIGHLIGHT_PLUGIN) { + if (column == COL_NOTES && modInfo->getColor().isValid()) { + return modInfo->getColor(); + } else if (modInfo->getHighlight() & ModInfo::HIGHLIGHT_PLUGIN) { return Settings::instance().colors().modlistContainsPlugin(); } else if (overwritten || archiveLooseOverwritten) { return Settings::instance().colors().modlistOverwritingLoose(); |