summaryrefslogtreecommitdiff
path: root/src/modinfodialog.cpp
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-05-29 10:08:46 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2019-05-31 11:54:31 -0400
commit98b3be3e9bbca73640842f6dadaa159dcec04f7b (patch)
tree8da1d56ae5e737197172856eecec45e1a1728743 /src/modinfodialog.cpp
parent4d90e502266dfb886e1d089fb26780d19a38e5a7 (diff)
removed buddy from FilterWidget, the intention was to hook a ctrl+f shortcut to it, but that won't work as a general solution, it would need to be on tabs for the modinfo dialog
added a simple matches() that just searches for the string FilterWidget can cleanly unhook itself
Diffstat (limited to 'src/modinfodialog.cpp')
-rw-r--r--src/modinfodialog.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 1e933a74..0f18033a 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -454,6 +454,7 @@ ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directo
m_advancedConflictFilter.set(ui->conflictsAdvancedFilter);
+ m_advancedConflictFilter.changed = [&]{ refreshConflictLists(false, true); };
// left-elide the overwrites column so that the nearest are visible
ui->conflictsAdvancedList->setItemDelegateForColumn(
@@ -873,6 +874,12 @@ QTreeWidgetItem* ModInfoDialog::createAdvancedConflictItem(
}
}
+ if (!m_advancedConflictFilter.matches(before) &&
+ !m_advancedConflictFilter.matches(relativeName) &&
+ !m_advancedConflictFilter.matches(after)) {
+ return nullptr;
+ }
+
QTreeWidgetItem* item = new QTreeWidgetItem;
item->setText(0, before);
item->setText(1, relativeName);