From a5330e21f18992d9373e9e15db3f2b8a03cdbb83 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Thu, 9 Nov 2023 14:38:05 +0100
Subject: [PATCH] make source editors non-collapsible

---
 GUI/View/Device/FootprintForm.cpp          | 5 ++---
 GUI/View/Device/FootprintForm.h            | 4 ++--
 GUI/View/Instrument/AlphaScanEditor.cpp    | 5 ++---
 GUI/View/Instrument/AlphaScanEditor.h      | 4 ++--
 GUI/View/Instrument/DistributionEditor.cpp | 5 ++---
 GUI/View/Instrument/DistributionEditor.h   | 4 ++--
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index cb821387f9a..eeab912412b 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -22,11 +22,10 @@
 #include <QFormLayout>
 
 FootprintForm::FootprintForm(QWidget* parent, SourceItem* item)
-    : CollapsibleGroupBox("Footprint correction", parent, item->expandFootprint)
+    : QGroupBox("Footprint correction", parent)
     , m_item(item)
 {
-    m_formLayout = new QFormLayout;
-    body()->setLayout(m_formLayout);
+    m_formLayout = new QFormLayout(this);
     m_formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
     ASSERT(item->footprintSelection().currentItem());
     auto* typeCombo = GUI::Util::createComboBoxFromProperty(
diff --git a/GUI/View/Device/FootprintForm.h b/GUI/View/Device/FootprintForm.h
index 56560be7d95..2c71d15b61c 100644
--- a/GUI/View/Device/FootprintForm.h
+++ b/GUI/View/Device/FootprintForm.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_DEVICE_FOOTPRINTFORM_H
 #define BORNAGAIN_GUI_VIEW_DEVICE_FOOTPRINTFORM_H
 
-#include "GUI/View/Widget/GroupBoxes.h"
+#include <QGroupBox>
 
 class QFormLayout;
 class SourceItem;
@@ -23,7 +23,7 @@ class SourceItem;
 //! FootprintCorrection editor (i.e. background) for instrument editors.
 //! Operates on InstrumentItem.
 
-class FootprintForm : public CollapsibleGroupBox {
+class FootprintForm : public QGroupBox {
     Q_OBJECT
 public:
     FootprintForm(QWidget* parent, SourceItem* item);
diff --git a/GUI/View/Instrument/AlphaScanEditor.cpp b/GUI/View/Instrument/AlphaScanEditor.cpp
index eecbfd42b3f..103fe2e8a20 100644
--- a/GUI/View/Instrument/AlphaScanEditor.cpp
+++ b/GUI/View/Instrument/AlphaScanEditor.cpp
@@ -20,11 +20,10 @@
 #include "GUI/View/Instrument/DistributionSelector.h"
 
 AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr)
-    : CollapsibleGroupBox("Grazing angles (deg)", parent, item->expandGroupBox)
+    : QGroupBox("Grazing angles (deg)", parent)
     , m_item(item)
 {
-    auto* layout = new QHBoxLayout;
-    body()->setLayout(layout);
+    auto* layout = new QHBoxLayout(this);
 
     auto* gform = new QFormLayout;
     layout->addLayout(gform);
diff --git a/GUI/View/Instrument/AlphaScanEditor.h b/GUI/View/Instrument/AlphaScanEditor.h
index b43650ae42d..e0ec0327b2c 100644
--- a/GUI/View/Instrument/AlphaScanEditor.h
+++ b/GUI/View/Instrument/AlphaScanEditor.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H
 #define BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H
 
-#include "GUI/View/Widget/GroupBoxes.h"
+#include <QGroupBox>
 
 class DistributionPlot;
 class DistributionSelector;
@@ -24,7 +24,7 @@ class SphericalAxisForm;
 
 //! Editor for scanning inclination angles
 
-class AlphaScanEditor : public CollapsibleGroupBox {
+class AlphaScanEditor : public QGroupBox {
     Q_OBJECT
 public:
     AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr);
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 1b3b1335e19..8f2174372c8 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -21,10 +21,9 @@ DistributionEditor::DistributionEditor(const QString& title,
                                        const std::optional<MeanConfig>& mean_config,
                                        GUI::ID::Distributions distributions, QWidget* parent,
                                        BeamDistributionItem* item, bool allow_distr)
-    : CollapsibleGroupBox(title, parent, item->expandGroupBox)
+    : QGroupBox(title, parent)
 {
-    auto* layout = new QVBoxLayout;
-    body()->setLayout(layout);
+    auto* layout = new QVBoxLayout(this);
 
     m_selector = new DistributionSelector(mean_config, distributions, this, item, allow_distr);
     layout->addWidget(m_selector);
diff --git a/GUI/View/Instrument/DistributionEditor.h b/GUI/View/Instrument/DistributionEditor.h
index 95e096efed7..c999ee6a34c 100644
--- a/GUI/View/Instrument/DistributionEditor.h
+++ b/GUI/View/Instrument/DistributionEditor.h
@@ -17,7 +17,7 @@
 
 #include "GUI/Support/Data/ID.h"
 #include "GUI/View/Instrument/DistributionSelector.h" // MeanConfig
-#include "GUI/View/Widget/GroupBoxes.h"
+#include <QGroupBox>
 #include <optional>
 
 class BeamDistributionItem;
@@ -27,7 +27,7 @@ class DoubleSpinBox;
 //! DistributionSelector contained in a GroupBox with a title and a button
 //! to open the distribution dialog
 
-class DistributionEditor : public CollapsibleGroupBox {
+class DistributionEditor : public QGroupBox {
     Q_OBJECT
 public:
     DistributionEditor(const QString& title, const std::optional<MeanConfig>& mean_config,
-- 
GitLab