From ba4ffc958684279294741cffdfc49dac602f6ed7 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 26 Oct 2023 14:25:47 +0200
Subject: [PATCH] GroupBoxCollapser: sort blocks
---
GUI/Support/Style/GroupBoxCollapser.cpp | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/GUI/Support/Style/GroupBoxCollapser.cpp b/GUI/Support/Style/GroupBoxCollapser.cpp
index ed19ad8a64f..fdb2d704b91 100644
--- a/GUI/Support/Style/GroupBoxCollapser.cpp
+++ b/GUI/Support/Style/GroupBoxCollapser.cpp
@@ -79,17 +79,6 @@ void GroupBoxCollapser::setExpanded(bool expanded)
GroupBoxCollapser::GroupBoxCollapser(QGroupBox* groupBox)
: QObject(groupBox)
{
- auto* mainLayout = new QVBoxLayout;
- mainLayout->setSpacing(0);
- mainLayout->setContentsMargins(0, 0, 0, 0);
-
- m_contentArea = new QWidget(groupBox);
- m_contentArea->setObjectName("ContentArea");
- m_contentArea->setLayout(groupBox->layout());
-
- mainLayout->addWidget(m_contentArea);
- groupBox->setLayout(mainLayout);
-
m_toggleButton = new QToolButton(groupBox);
m_toggleButton->setObjectName("GroupBoxToggler");
if (appSettings->currentStyle() == ApplicationSettings::Style::native)
@@ -113,8 +102,18 @@ GroupBoxCollapser::GroupBoxCollapser(QGroupBox* groupBox)
m_titleWidget->setAttribute(Qt::WA_StyledBackground, true);
m_titleWidget->setLayout(m_titleLayout);
- groupBox->layout()->setMenuBar(m_titleWidget);
- groupBox->setTitle("");
+ m_contentArea = new QWidget(groupBox);
+ m_contentArea->setObjectName("ContentArea");
+ m_contentArea->setLayout(groupBox->layout());
+
+ auto* mainLayout = new QVBoxLayout;
+ mainLayout->setSpacing(0);
+ mainLayout->setContentsMargins(0, 0, 0, 0);
+ mainLayout->setMenuBar(m_titleWidget);
+ mainLayout->addWidget(m_contentArea);
+
+ groupBox->setTitle(""); // title has been read above
+ groupBox->setLayout(mainLayout); // overwrites layout that has been read above
connect(m_toggleButton, &QAbstractButton::clicked, this, &GroupBoxCollapser::toggle,
Qt::UniqueConnection);
--
GitLab