summaryrefslogtreecommitdiff
path: root/src/modlistview.cpp
diff options
context:
space:
mode:
authorMikaël Capelle <capelle.mikael@gmail.com>2021-01-14 20:30:06 +0100
committerMikaël Capelle <capelle.mikael@gmail.com>2021-01-14 20:30:06 +0100
commit38129e6e7760ffcb660de88e7b87e691e16a49df (patch)
tree362a05389888648089d39604fecbbce3954ed5bb /src/modlistview.cpp
parent662a1eb3d7073166b1db3a05e34ecefd73046e3b (diff)
Disable highlighting from/to separators separately.
Diffstat (limited to 'src/modlistview.cpp')
-rw-r--r--src/modlistview.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modlistview.cpp b/src/modlistview.cpp
index 63f38c46..9cc6d8b8 100644
--- a/src/modlistview.cpp
+++ b/src/modlistview.cpp
@@ -1029,7 +1029,7 @@ void ModListView::refreshMarkersAndPlugins()
{
QModelIndexList indexes = selectionModel()->selectedRows();
- if (m_core->settings().interface().collapsibleSeparatorsConflicts()) {
+ if (m_core->settings().interface().collapsibleSeparatorsHighlightFrom()) {
for (auto& idx : selectionModel()->selectedRows()) {
if (hasCollapsibleSeparators()
&& model()->hasChildren(idx)
@@ -1103,7 +1103,7 @@ QColor ModListView::markerColor(const QModelIndex& index) const
// collapsed separator
auto rowIndex = index.sibling(index.row(), 0);
if (hasCollapsibleSeparators()
- && m_core->settings().interface().collapsibleSeparatorsConflicts()
+ && m_core->settings().interface().collapsibleSeparatorsHighlightTo()
&& model()->hasChildren(rowIndex) && !isExpanded(rowIndex)) {
std::vector<QColor> colors;
@@ -1140,7 +1140,6 @@ std::vector<ModInfo::EFlag> ModListView::modFlags(const QModelIndex& index, bool
bool compact = false;
if (info->isSeparator()
&& hasCollapsibleSeparators()
- && m_core->settings().interface().collapsibleSeparatorsConflicts()
&& !isExpanded(index.sibling(index.row(), 0))) {
// combine the child conflicts
@@ -1171,7 +1170,6 @@ std::vector<ModInfo::EConflictFlag> ModListView::conflictFlags(const QModelIndex
bool compact = false;
if (info->isSeparator()
&& hasCollapsibleSeparators()
- && m_core->settings().interface().collapsibleSeparatorsConflicts()
&& !isExpanded(index.sibling(index.row(), 0))) {
// combine the child conflicts
@@ -1206,7 +1204,6 @@ std::set<int> ModListView::contents(const QModelIndex& index, bool* includeChild
if (info->isSeparator()
&& hasCollapsibleSeparators()
- && m_core->settings().interface().collapsibleSeparatorsConflicts()
&& !isExpanded(index.sibling(index.row(), 0))) {
// combine the child contents