sunyu/OfficeAssistant_Win10
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第一阶段只差兼容性问题了

Browse Source
This commit is contained in:
Mike Solar
2023-08-01 23:51:40 +08:00
parent 9b53ef9764
commit 6a695e8a03
20 changed files with 167 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OfficeAssistant_msvc/mainwindowlayout.cpp
View File

@ -11,6 +11,7 @@
MainWindowLayout::MainWindowLayout(QWidget *parent) :
QWidget(parent), ui(new Ui::MainWindowLayout) {
ui->setupUi(this);
setContentsMargins(0, 0, 0, 0);
layout=new QVBoxLayout(this);
mainWindowLayout = this;
ConfigRequest *configRequest = new ConfigRequest;
@ -18,13 +19,17 @@ MainWindowLayout::MainWindowLayout(QWidget *parent) :
configRequest->sendRequest(configResponse);
mainScreen = new MainScreen(this);
navBar=new NavBar(configResponse,mainScreen,this);
navBar->setAttribute(Qt::WA_DeleteOnClose);
navBar->setMinimumHeight(0);
navBar->setMaximumHeight(this->height() / 8);
mainScreen->setMinimumHeight(0);
//navBar->setAttribute(Qt::WA_DeleteOnClose);
delete configRequest;
//QSizePolicy sizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::QSizePolicy::Fixed);
//navBar->setSizePolicy(sizePolicy);
layout->setMargin(0);
//layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(navBar,1);
layout->addWidget(mainScreen,7);
layout->setMargin(0);
setLayout(layout);
connect(this,&MainWindowLayout::clickButton1,mainScreen,&MainScreen::clickButton1);
}
@ -42,7 +47,7 @@ MainWindowLayout::~MainWindowLayout() {
void MainWindowLayout::resizeEvent(QResizeEvent *event) {
QWidget::resizeEvent(event);
navBar->resize(navBar->width(),height()/8);
navBar->setMaximumHeight(event->size().height()/8);
//layout->setAlignment(Qt::AlignmentFlag::AlignHCenter);
}