From 95a8ab7c5c59deb95f42734de796ad9e4924ddaf Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Wed, 21 Feb 2024 21:36:37 +0100 Subject: [PATCH] CollapsibleGroupBox + c'tor w/o title --- GUI/View/Sample/LayerForm.cpp | 2 +- GUI/View/Widget/GroupBoxes.cpp | 9 +++++++-- GUI/View/Widget/GroupBoxes.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/GUI/View/Sample/LayerForm.cpp b/GUI/View/Sample/LayerForm.cpp index 0734225d201..b7539847fe6 100644 --- a/GUI/View/Sample/LayerForm.cpp +++ b/GUI/View/Sample/LayerForm.cpp @@ -30,7 +30,7 @@ #include <QPushButton> LayerForm::LayerForm(QWidget* parent, LayerItem* layerItem, SampleEditorController* ec) - : CollapsibleGroupBox(layerItem->layerName(), parent, layerItem->expandLayer) + : CollapsibleGroupBox(parent, layerItem->expandLayer) , m_layout(new HeinzFormLayout(ec)) , m_layer(layerItem) , m_ec(ec) diff --git a/GUI/View/Widget/GroupBoxes.cpp b/GUI/View/Widget/GroupBoxes.cpp index 07688de8f58..9ac41c1a596 100644 --- a/GUI/View/Widget/GroupBoxes.cpp +++ b/GUI/View/Widget/GroupBoxes.cpp @@ -43,7 +43,7 @@ StaticGroupBox::StaticGroupBox(const QString& title, QWidget* parent) // class CollapsibleGroupBox // ************************************************************************************************ -CollapsibleGroupBox::CollapsibleGroupBox(const QString& title, QWidget* parent, bool& expanded) +CollapsibleGroupBox::CollapsibleGroupBox(QWidget* parent, bool& expanded) : QssWidget(parent) , m_title_widget(new QWidget) , m_title_layout(new QHBoxLayout(m_title_widget)) @@ -68,7 +68,6 @@ CollapsibleGroupBox::CollapsibleGroupBox(const QString& title, QWidget* parent, m_toggle_button->setObjectName("GroupBoxToggler"); m_toggle_button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); m_toggle_button->setCheckable(true); - m_toggle_button->setText(title); m_toggle_button->setArrowType(Qt::ArrowType::DownArrow); m_toggle_button->setChecked(expanded); m_toggle_button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding); @@ -87,6 +86,12 @@ CollapsibleGroupBox::CollapsibleGroupBox(const QString& title, QWidget* parent, }); } +CollapsibleGroupBox::CollapsibleGroupBox(const QString& title, QWidget* parent, bool& expanded) + : CollapsibleGroupBox(parent, expanded) +{ + setTitle(title); +} + void CollapsibleGroupBox::setTitle(const QString& title) { m_toggle_button->setText(title); diff --git a/GUI/View/Widget/GroupBoxes.h b/GUI/View/Widget/GroupBoxes.h index f97292ddc25..4fb548adddc 100644 --- a/GUI/View/Widget/GroupBoxes.h +++ b/GUI/View/Widget/GroupBoxes.h @@ -39,6 +39,7 @@ private: class CollapsibleGroupBox : public QssWidget { Q_OBJECT public: + CollapsibleGroupBox(QWidget* parent, bool& expanded); CollapsibleGroupBox(const QString& title, QWidget* parent, bool& expanded); QWidget* body() { return m_body; } void setTitle(const QString& title); -- GitLab