gui: added scroll area to CollapsableMenuControlButton

- this fixes overlapping channels if there are too many

Signed-off-by: Andrei Popa <[email protected]>

gui/include/gui/widgets/menucontrolbutton.h

@@ -13,7 +13,6 @@
 #include <utils.h>
 #include <compositewidget.h>
 
-
 class QScrollArea;
 namespace scopy {
 

gui/include/gui/widgets/verticalchannelmanager.h

@@ -7,6 +7,7 @@
 #include <scopy-gui_export.h>
 #include <compositewidget.h>
 
+class QScrollArea;
 namespace scopy {
 class SCOPY_GUI_EXPORT VerticalChannelManager : public QWidget, public CompositeWidget
 {
@@ -21,6 +22,9 @@ class SCOPY_GUI_EXPORT VerticalChannelManager : public QWidget, public Composite
 private:
 	QSpacerItem *spacer;
 	QVBoxLayout *lay;
+	QVBoxLayout *m_contLayout;
+	QScrollArea *m_scrollArea;
+	QWidget *m_container;
 };
 } // namespace scopy
 

gui/src/widgets/verticalchannelmanager.cpp

@@ -1,33 +1,49 @@
 #include <widgets/verticalchannelmanager.h>
+#include <QScrollArea>
 
 using namespace scopy;
 VerticalChannelManager::VerticalChannelManager(QWidget *parent)
 	: QWidget(parent)
 {
 	lay = new QVBoxLayout(this);
-	setLayout(lay);
 	lay->setMargin(0);
-	lay->setSpacing(6);
-	spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding);
-	lay->addSpacerItem(spacer);
+	lay->setSpacing(0);
+
+	setLayout(lay);
 	setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+	spacer = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+	QWidget *m_container = new QWidget(this);
+	m_contLayout = new QVBoxLayout(m_container);
+	m_contLayout->addSpacerItem(spacer);
+	m_contLayout->setMargin(0);
+	m_contLayout->setSpacing(6);
+	m_container->setLayout(m_contLayout);
+
+	m_scrollArea = new QScrollArea(this);
+	m_scrollArea->setWidget(m_container);
+	m_scrollArea->setWidgetResizable(true);
+	m_scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+	m_scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	lay->addWidget(m_scrollArea);
 }
 
 VerticalChannelManager::~VerticalChannelManager() {}
 
 void VerticalChannelManager::add(QWidget *ch)
 {
-	int position = lay->indexOf(spacer);
-	lay->insertWidget(position, ch);
+	int position = m_contLayout->indexOf(spacer);
+	m_contLayout->insertWidget(position, ch);
 	ch->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 }
 
 void VerticalChannelManager::addEnd(QWidget *ch)
 {
-	lay->addWidget(ch);
+	m_contLayout->addWidget(ch);
 	ch->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 }
 
-void VerticalChannelManager::remove(QWidget *ch) { lay->removeWidget(ch); }
+void VerticalChannelManager::remove(QWidget *ch) { m_contLayout->removeWidget(ch); }
 
 #include "moc_verticalchannelmanager.cpp"