diff --git a/CMakeLists.txt b/CMakeLists.txt index bdb27ec..1d7068e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ qt_add_executable(${AppExec} static/resources.qrc src/gui/main.cpp src/gui/Interface.cpp + src/gui/UtilWidgets/Splitter.cpp src/gui/viewport/Viewport.cpp src/gui/viewport/ViewportGLWidget.cpp src/gui/viewport/GLCamera.cpp diff --git a/src/gui/Interface.cpp b/src/gui/Interface.cpp index 4da24d4..ba56a45 100644 --- a/src/gui/Interface.cpp +++ b/src/gui/Interface.cpp @@ -4,6 +4,7 @@ #include #include #include +#include EnzoUI::EnzoUI() { @@ -22,8 +23,13 @@ EnzoUI::EnzoUI() Viewport* viewport = new Viewport(); Network* network = new Network(this); + constexpr int margin = 2; + viewport->layout()->setContentsMargins(margin, margin, margin, margin); + network->layout()->setContentsMargins(margin, margin, margin, margin); + mainLayout_->setContentsMargins(margin, margin, margin, margin); - viewportSplitter_ = new QSplitter(this); + + viewportSplitter_ = new Splitter(this); @@ -31,7 +37,7 @@ EnzoUI::EnzoUI() viewportSplitter_->addWidget(network); // viewportSplitter_->addWidget(new QPushButton("hello world")); - viewportSplitter_->setStretchFactor(0, 10); + viewportSplitter_->setStretchFactor(0, 20); viewportSplitter_->setStretchFactor(1, 1); mainLayout_->addWidget(viewportSplitter_); diff --git a/src/gui/Interface.h b/src/gui/Interface.h index 684d037..0b551bf 100644 --- a/src/gui/Interface.h +++ b/src/gui/Interface.h @@ -2,6 +2,7 @@ #include #include #include +#include class EnzoUI : public QWidget @@ -12,7 +13,7 @@ class EnzoUI private: QVBoxLayout* mainLayout_; QVBoxLayout* viewportSplitLayout_; - QSplitter* viewportSplitter_; + Splitter* viewportSplitter_; }; diff --git a/src/gui/UtilWidgets/Splitter.cpp b/src/gui/UtilWidgets/Splitter.cpp new file mode 100644 index 0000000..23134ff --- /dev/null +++ b/src/gui/UtilWidgets/Splitter.cpp @@ -0,0 +1,7 @@ +#include + +Splitter::Splitter(QWidget *parent) +: QSplitter(parent) +{ + setHandleWidth(0); +} diff --git a/src/gui/UtilWidgets/Splitter.h b/src/gui/UtilWidgets/Splitter.h new file mode 100644 index 0000000..cc02b2c --- /dev/null +++ b/src/gui/UtilWidgets/Splitter.h @@ -0,0 +1,9 @@ +#pragma once +#include + +class Splitter +: public QSplitter +{ +public: + Splitter(QWidget *parent = nullptr); +};