Skip to content
Snippets Groups Projects
Commit 8aee0892 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

SampleEditor inherit frm QScrollArea

parent 67e1f287
No related branches found
No related tags found
1 merge request!2072cleanup sample viewer code; m redundant 'Create sample' button (#778)
......@@ -24,22 +24,16 @@
#include <QActionGroup>
#include <QBoxLayout>
#include <QPushButton>
#include <QScrollArea>
SampleEditor::SampleEditor(QWidget* parent, ProjectDocument* document)
: QWidget(parent)
: QScrollArea(parent)
, m_currentSampleWidget(nullptr)
, m_currentSample(nullptr)
, m_document(document)
{
m_scrollArea = new QScrollArea(this);
m_scrollArea->setWidgetResizable(true);
m_scrollArea->setWidget(createEmptyWidget());
auto* mainLayout = new QVBoxLayout(this);
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setSpacing(0);
mainLayout->addWidget(m_scrollArea);
QScrollArea::setWidgetResizable(true);
QScrollArea::setWidget(createEmptyWidget());
}
SampleEditor::~SampleEditor()
......@@ -53,11 +47,11 @@ void SampleEditor::setCurrentSample(SampleItem* sampleItem)
m_editControllers[m_currentSample]->setSampleForm(nullptr);
m_currentSampleWidget = nullptr;
delete m_scrollArea->takeWidget();
delete QScrollArea::takeWidget();
m_currentSample = sampleItem;
if (m_currentSample == nullptr) {
m_scrollArea->setWidget(createEmptyWidget());
QScrollArea::setWidget(createEmptyWidget());
return;
}
......@@ -75,7 +69,7 @@ void SampleEditor::setCurrentSample(SampleItem* sampleItem)
m_currentSampleWidget = new SampleForm(this, m_currentSample, ec);
ec->setSampleForm(m_currentSampleWidget);
m_currentSampleWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
m_scrollArea->setWidget(m_currentSampleWidget);
QScrollArea::setWidget(m_currentSampleWidget);
}
void SampleEditor::createLayerColors() // #baLayerEditor move to better place
......
......@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITOR_H
#include <QMap>
#include <QWidget>
#include <QScrollArea>
class Item3D;
class SampleForm;
......@@ -26,7 +26,7 @@ class QScrollArea;
class SampleEditorController;
//! Sample editor with layer oriented presentation of a sample
class SampleEditor : public QWidget {
class SampleEditor : public QScrollArea {
Q_OBJECT
public:
SampleEditor(QWidget* parent, ProjectDocument* document);
......@@ -47,7 +47,6 @@ private:
QWidget* createEmptyWidget();
SampleForm* m_currentSampleWidget;
QScrollArea* m_scrollArea;
SampleItem* m_currentSample = nullptr;
QMap<SampleItem*, SampleEditorController*> m_editControllers;
ProjectDocument* m_document;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment