From 7cbfb714b68337a2603c0672fa54abb6ea8385b9 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 20 Jun 2024 20:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=84=E5=AD=98=E5=99=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libzqt/zui/z_function_list_box.cpp | 8 ++++---- libzqt/zui/z_reg_table_list_box.cpp | 10 +++++++--- libzqt/zui/zq_vtab_page.cpp | 2 +- src/mainwindow.ui | 30 +++++++++++++++++++++++++++--- 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/libzqt/zui/z_function_list_box.cpp b/libzqt/zui/z_function_list_box.cpp index c78176c..3af19c4 100644 --- a/libzqt/zui/z_function_list_box.cpp +++ b/libzqt/zui/z_function_list_box.cpp @@ -14,14 +14,14 @@ ZQFunctionListBox::ZQFunctionListBox(QWidget *parent, const QString &title, int m_column = column; // add QSpacer - m_verticalSpacer = new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding); + // m_verticalSpacer = new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding); // m_hSpacer = new QSpacerItem(100, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); for (size_t i = 0; i < column; i++) { layout->setColumnStretch(i, 1); } // add Spacer - m_layout->addItem(m_verticalSpacer, 0, 0, 1, 1); + // m_layout->addItem(m_verticalSpacer, 0, 0, 1, 1); // if (m_column > 1) m_layout->addItem(m_hSpacer, 0, m_column - 1, 1, 1); // add Box To Tab @@ -30,7 +30,7 @@ ZQFunctionListBox::ZQFunctionListBox(QWidget *parent, const QString &title, int void ZQFunctionListBox::regOnException(function onException) { m_onException = onException; } void ZQFunctionListBox::newFunc(QString zh_name, QStringList params, std::function onButtonClick) { - m_layout->removeItem(m_verticalSpacer); + // m_layout->removeItem(m_verticalSpacer); // m_layout->removeItem(m_hSpacer); int rowcnt = m_layout->rowCount(); @@ -76,7 +76,7 @@ void ZQFunctionListBox::newFunc(QString zh_name, QStringList params, std::functi }); }); - m_layout->addItem(m_verticalSpacer, rowcnt + 1, 0, 1, 1); + // m_layout->addItem(m_verticalSpacer, rowcnt + 1, 0, 1, 1); // if (m_column > 1) m_layout->addItem(m_hSpacer, rowcnt + 1, m_column - 1, 1, 1); if (!workQ.isWorking()) { diff --git a/libzqt/zui/z_reg_table_list_box.cpp b/libzqt/zui/z_reg_table_list_box.cpp index c10bf17..d12b4cf 100644 --- a/libzqt/zui/z_reg_table_list_box.cpp +++ b/libzqt/zui/z_reg_table_list_box.cpp @@ -66,6 +66,11 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title) // this->setLayout(m_layout); parent->layout()->addWidget(this); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(1); + this->setSizePolicy(sizePolicy); + { // funcBox { @@ -87,7 +92,7 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title) // testar->setWidget(m_arWidget); // 将设置好的幕布嵌入到滚动显示区域 testar->setWidgetResizable(true); // 设置幕布自适应大小 testar->setSizePolicy(sp); - testar->setMinimumSize(700, 500); + // testar->setMinimumSize(700, 500); } m_regBoxLayoutL1 = new QVBoxLayout(m_regBox); @@ -101,8 +106,7 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title) // parent->layout()->addWidget(this); } void ZRegTableList::addSpacer() { - m_layout->addItem(new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding)); - m_regBoxLayoutL2->addItem(new QSpacerItem(20, 100, QSizePolicy::Minimum, QSizePolicy::Expanding)); + m_regBoxLayoutL2->addItem(new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding)); } void ZRegTableList::addReg(QString title, int addr, uint32_t flag) { diff --git a/libzqt/zui/zq_vtab_page.cpp b/libzqt/zui/zq_vtab_page.cpp index c1637d5..096e743 100644 --- a/libzqt/zui/zq_vtab_page.cpp +++ b/libzqt/zui/zq_vtab_page.cpp @@ -16,6 +16,6 @@ void ZQVTabPage::addBox(QGroupBox *box) { } void ZQVTabPage::addSpacer() { - m_verticalSpacer = new QSpacerItem(20, 1000, QSizePolicy::Minimum, QSizePolicy::Expanding); + m_verticalSpacer = new QSpacerItem(20, 1, QSizePolicy::Expanding, QSizePolicy::Expanding); m_layout->addItem(m_verticalSpacer); } diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 48134f1..c0cc1b2 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 1458 - 556 + 1497 + 940 @@ -971,9 +971,33 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { Qt::DefaultContextMenu + + QTabWidget::North + + + QTabWidget::Rounded + 0 + + Qt::ElideLeft + + + false + + + false + + + false + + + false + + + false + 基础页 @@ -1140,7 +1164,7 @@ p, li { white-space: pre-wrap; } 0 0 - 1458 + 1497 20