summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAL <26797547+Al12rs@users.noreply.github.com>2020-10-30 02:15:34 +0100
committerAL <26797547+Al12rs@users.noreply.github.com>2020-10-30 02:15:34 +0100
commit2833f8d61b56a3f4ed6b2a8fafeb679033e6989e (patch)
tree0b77cef514cc89d7e37353fcfc3240a06dc513d5 /src
parent0c485304c199841ce8a77f0ba7c5b4c346a3e8a8 (diff)
Make advanced conflicts tab use italic if current mod file is from archive, instead of using the status of the winning version.
Diffstat (limited to 'src')
-rw-r--r--src/modinfodialogconflicts.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 1a813f7b..751a829e 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -887,6 +887,7 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
std::wstring before, after;
auto currOrigin = m_tab->origin();
+ bool isCurrOrigArchive = archive;
if (!alternatives.empty()) {
const bool showAllAlts = ui->conflictsAdvancedShowAll->isChecked();
@@ -927,6 +928,7 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
});
if (currModIter != alternatives.end()) {
+ isCurrOrigArchive = currModIter->second.first.size() > 0;
if (showAllAlts) {
// fills 'before' and 'after' with all the alternatives that come
@@ -1010,5 +1012,5 @@ std::optional<ConflictItem> AdvancedConflictsTab::createItem(
return ConflictItem(
std::move(beforeQS), std::move(relativeName), std::move(afterQS),
- index, std::move(fileName), hasAlts, QString(), archive);
+ index, std::move(fileName), hasAlts, QString(), isCurrOrigArchive);
}