fix: adjust stretch factors
This commit is contained in:
@@ -24,7 +24,7 @@ EnzoUI::EnzoUI()
|
|||||||
setStyleSheet("background-color:#1d2021;");
|
setStyleSheet("background-color:#1d2021;");
|
||||||
|
|
||||||
Viewport* viewport = new Viewport();
|
Viewport* viewport = new Viewport();
|
||||||
Network* network = new Network(this);
|
Network* network = new Network();
|
||||||
ParametersPanel* parametersPanel = new ParametersPanel();
|
ParametersPanel* parametersPanel = new ParametersPanel();
|
||||||
|
|
||||||
constexpr int margin = 2;
|
constexpr int margin = 2;
|
||||||
@@ -34,6 +34,7 @@ EnzoUI::EnzoUI()
|
|||||||
mainLayout_->setContentsMargins(margin, margin, margin, margin);
|
mainLayout_->setContentsMargins(margin, margin, margin, margin);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
viewportSplitter_ = new Splitter(this);
|
viewportSplitter_ = new Splitter(this);
|
||||||
networkSplitter_ = new Splitter(this);
|
networkSplitter_ = new Splitter(this);
|
||||||
networkSplitter_->setOrientation(Qt::Vertical);
|
networkSplitter_->setOrientation(Qt::Vertical);
|
||||||
@@ -42,13 +43,13 @@ EnzoUI::EnzoUI()
|
|||||||
|
|
||||||
viewportSplitter_->addWidget(viewport);
|
viewportSplitter_->addWidget(viewport);
|
||||||
viewportSplitter_->addWidget(networkSplitter_);
|
viewportSplitter_->addWidget(networkSplitter_);
|
||||||
viewportSplitter_->setStretchFactor(0, 25);
|
viewportSplitter_->setStretchFactor(0, 4);
|
||||||
viewportSplitter_->setStretchFactor(1, 1);
|
viewportSplitter_->setStretchFactor(1, 1);
|
||||||
|
|
||||||
networkSplitter_->addWidget(parametersPanel);
|
networkSplitter_->addWidget(parametersPanel);
|
||||||
networkSplitter_->addWidget(network);
|
networkSplitter_->addWidget(network);
|
||||||
networkSplitter_->setStretchFactor(0, 1);
|
networkSplitter_->setStretchFactor(0, 10);
|
||||||
networkSplitter_->setStretchFactor(1, 10);
|
networkSplitter_->setStretchFactor(1, 1);
|
||||||
|
|
||||||
mainLayout_->addWidget(viewportSplitter_);
|
mainLayout_->addWidget(viewportSplitter_);
|
||||||
|
|
||||||
@@ -56,4 +57,21 @@ EnzoUI::EnzoUI()
|
|||||||
connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, viewport, &Viewport::geometryChanged);
|
connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, viewport, &Viewport::geometryChanged);
|
||||||
connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, parametersPanel, &ParametersPanel::selectionChanged);
|
connect(&enzo::nt::nm(), &enzo::nt::NetworkManager::updateDisplay, parametersPanel, &ParametersPanel::selectionChanged);
|
||||||
|
|
||||||
|
// ─── end of EnzoUI ctor ───
|
||||||
|
QTimer::singleShot(0, this, [=] {
|
||||||
|
auto dump = [](const char* name, QWidget* w) {
|
||||||
|
qInfo().nospace()
|
||||||
|
<< name
|
||||||
|
<< " sizeHint=" << w->sizeHint()
|
||||||
|
<< " minHint=" << w->minimumSizeHint()
|
||||||
|
<< " min=" << w->minimumSize()
|
||||||
|
<< " policy=" << w->sizePolicy();
|
||||||
|
};
|
||||||
|
|
||||||
|
dump("Viewport ", viewport);
|
||||||
|
dump("ParametersPanel ", parametersPanel);
|
||||||
|
dump("Network ", network);
|
||||||
|
dump("NetworkSplitter ", networkSplitter_); // will show max(child‑mins)
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,9 +28,9 @@ Network::Network(QWidget* parent)
|
|||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
|
|
||||||
mainLayout_ = new QVBoxLayout(parent);
|
mainLayout_ = new QVBoxLayout(this);
|
||||||
// mainLayout_->setContentsMargins(0,0,0,0);
|
// mainLayout_->setContentsMargins(0,0,0,0);
|
||||||
this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
// this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||||
|
|
||||||
|
|
||||||
tabMenu_ = new enzo::ui::TabMenu(this);
|
tabMenu_ = new enzo::ui::TabMenu(this);
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ ParametersPanel::ParametersPanel(QWidget *parent, Qt::WindowFlags f)
|
|||||||
)"
|
)"
|
||||||
);
|
);
|
||||||
|
|
||||||
mainLayout_->addLayout(parametersLayout_);
|
|
||||||
mainLayout_->addWidget(bgWidget_);
|
mainLayout_->addWidget(bgWidget_);
|
||||||
|
|
||||||
// parametersLayout_->addWidget(new enzo::ui::AbstractFormParm());
|
// parametersLayout_->addWidget(new enzo::ui::AbstractFormParm());
|
||||||
|
|||||||
@@ -14,17 +14,10 @@ Viewport::Viewport(QWidget *parent, Qt::WindowFlags f)
|
|||||||
: QWidget(parent, f)
|
: QWidget(parent, f)
|
||||||
{
|
{
|
||||||
mainLayout_=new QVBoxLayout();
|
mainLayout_=new QVBoxLayout();
|
||||||
openGLWidget_ = new ViewportGLWidget(this); mainLayout_->addWidget(openGLWidget_);
|
openGLWidget_ = new ViewportGLWidget(this);
|
||||||
openGLWidget_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
mainLayout_->addWidget(openGLWidget_);
|
||||||
this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
|
||||||
// mainLayout_->addWidget(new QPushButton("hello world"));
|
|
||||||
this->setLayout(mainLayout_);
|
this->setLayout(mainLayout_);
|
||||||
// this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
|
||||||
// QTimer::singleShot(100, this, [=] {
|
|
||||||
// std::cout << "MyGLWidget size: " << openGLWidget_->width() << " x " << openGLWidget_->height() << std::endl;
|
|
||||||
// });
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Viewport::geometryChanged(enzo::geo::Geometry& geometry)
|
void Viewport::geometryChanged(enzo::geo::Geometry& geometry)
|
||||||
|
|||||||
Reference in New Issue
Block a user