From ff074e4b4c86c6edc7ed4d78886080318526d3ae Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 14 Jun 2018 20:24:05 +0200 Subject: Added back some size limits for UI --- gui/designwidget.cc | 2 ++ gui/gui.cmake | 3 ++- 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"); -- cgit v1.2.3