diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-06-14 20:24:05 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-06-14 20:24:05 +0200 |
| commit | ff074e4b4c86c6edc7ed4d78886080318526d3ae (patch) | |
| tree | 0d038a32e1194b4c3c5083ce28cea91e54f29258 | |
| parent | 1336eb0630a3ccb441377bad385ea72750d2ae2d (diff) | |
| download | nextpnr-ff074e4b4c86c6edc7ed4d78886080318526d3ae.tar.gz nextpnr-ff074e4b4c86c6edc7ed4d78886080318526d3ae.tar.bz2 nextpnr-ff074e4b4c86c6edc7ed4d78886080318526d3ae.zip | |
Added back some size limits for UI
| -rw-r--r-- | gui/designwidget.cc | 2 | ||||
| -rw-r--r-- | gui/gui.cmake | 3 | ||||
| -rw-r--r-- | gui/mainwindow.cc | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gui/designwidget.cc b/gui/designwidget.cc index 4d8cee50..06b848a5 100644 --- a/gui/designwidget.cc +++ b/gui/designwidget.cc @@ -139,6 +139,8 @@ DesignWidget::DesignWidget(Design *_design, QWidget *parent) splitter->addWidget(propertyEditor);
QGridLayout *mainLayout = new QGridLayout();
+ mainLayout->setSpacing(0);
+ mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->addWidget(splitter);
setLayout(mainLayout);
diff --git a/gui/gui.cmake b/gui/gui.cmake index 45402c1c..fb7f2db4 100644 --- a/gui/gui.cmake +++ b/gui/gui.cmake @@ -27,7 +27,8 @@ set(UI_SOURCES qt5_wrap_ui_custom(GENERATED_UI_HEADERS ${UI_SOURCES}) qt5_add_resources_custom(GUI_RESOURCE_FILES gui/nextpnr.qrc) -set(GUI_SOURCE_FILES gui/mainwindow.cc gui/fpgaviewwidget.cc gui/pythontab.cc gui/infotab.cc gui/designwidget.cc gui/emb.cc ${GENERATED_MOC_FILES} ${GENERATED_UI_HEADERS} ${GUI_RESOURCE_FILES}) +aux_source_directory(gui/ GUI_ALL_SOURCE_FILES) +set(GUI_SOURCE_FILES ${GUI_ALL_SOURCE_FILES} ${GENERATED_MOC_FILES} ${GENERATED_UI_HEADERS} ${GUI_RESOURCE_FILES}) set(GUI_LIBRARY_FILES Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES} QtPropertyBrowser) diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc index e41da79a..e683e0c5 100644 --- a/gui/mainwindow.cc +++ b/gui/mainwindow.cc @@ -13,9 +13,11 @@ MainWindow::MainWindow(Design *_design, QWidget *parent) ui->splitter->addWidget(new FPGAViewWidget());
- ui->splitter_2->addWidget(new DesignWidget(design));
- ui->splitter_2->setMinimumWidth(300);
- ui->splitter_2->setMaximumWidth(300);
+ DesignWidget *designview = new DesignWidget(design);
+ designview->setMinimumWidth(300);
+ designview->setMaximumWidth(300);
+
+ ui->splitter_2->addWidget(designview);
tabWidget = new QTabWidget();
tabWidget->addTab(new PythonTab(), "Python");
|