sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
xueyan hu
2021-12-20 15:38:52 +08:00
parent 94fc8892ac
commit 6cf1a1b556
1 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainwindow.cpp
View File

@@ -147,10 +147,6 @@ MainWindow::MainWindow(QWidget* parent) :
tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QVBoxLayout* layout = new QVBoxLayout(this); QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0); layout->setMargin(0);
layout->setSpacing(0);
QWidget * top = new TopBarWidget(this);
top->setObjectName("topbarWidget");
layout->addWidget(top);
layout->addWidget(tab); layout->addWidget(tab);
ui->centralWidget->setLayout(layout); ui->centralWidget->setLayout(layout);
@@ -270,7 +266,8 @@ void MainWindow::centerWidgetShow() {
AdminSettingForm* form = new AdminSettingForm(this); AdminSettingForm* form = new AdminSettingForm(this);
admin_tab_index = tab->addTab(form, "Admin"); admin_tab_index = tab->addTab(form, "Admin");
} }
} else{ }
else {
if (admin_tab_index != -1) { if (admin_tab_index != -1) {
tab->removeTab(admin_tab_index); tab->removeTab(admin_tab_index);
admin_tab_index = -1; admin_tab_index = -1;