From fbd7e777d76c2032d8c4df418e5550b14b9c2943 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Sun, 3 Jan 2021 16:30:35 +0100
Subject: Add option to enable/disable displaying conflicts on collapsed
 separators.

---
 src/settings.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/settings.cpp')

diff --git a/src/settings.cpp b/src/settings.cpp
index 3cc026cf..e04cd0c1 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -2185,6 +2185,16 @@ void InterfaceSettings::setCollapsibleSeparators(bool b)
   set(m_Settings, "Settings", "collapsible_separators", b);
 }
 
+bool InterfaceSettings::collapsibleSeparatorsConflicts() const
+{
+  return get<bool>(m_Settings, "Settings", "collapsible_separators_conflicts", true);
+}
+
+void InterfaceSettings::setCollapsibleSeparatorsConflicts(bool b)
+{
+  set(m_Settings, "Settings", "collapsible_separators_conflicts", b);
+}
+
 bool InterfaceSettings::compactDownloads() const
 {
   return get<bool>(m_Settings, "Settings", "compact_downloads", false);
-- 
cgit v1.3.1