From d00951cd3389a0497d2f6ab9953604965c462ffe Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 5 Jun 2024 22:44:35 +0800 Subject: [PATCH] update --- libzqt/zui/z_reg_table_list_box.cpp | 9 ++++++--- src/mainwindow.ui | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libzqt/zui/z_reg_table_list_box.cpp b/libzqt/zui/z_reg_table_list_box.cpp index 499ff1e..663334c 100644 --- a/libzqt/zui/z_reg_table_list_box.cpp +++ b/libzqt/zui/z_reg_table_list_box.cpp @@ -31,7 +31,7 @@ ZRegItem::ZRegItem(QWidget *parent, QString &title, int addr, uint32_t flag) : Q m_layout->setMargin(0); // m_layout->setSpacing(0); - m_horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + m_horizontalSpacer = new QSpacerItem(30, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); m_lable = new QLabel(title, this); m_val = new QLineEdit(this); m_InfoVal = new QLineEdit(this); @@ -75,6 +75,9 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title) // // RegBox { m_regBox = new QGroupBox("寄存器列表", this); + auto sp = QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + sp.setVerticalStretch(1); + m_regBox->setSizePolicy(sp); { QScrollArea *testar = new QScrollArea(); // 创建滚动显示区域 { @@ -83,8 +86,8 @@ ZRegTableList::ZRegTableList(QWidget *parent, const QString &title) // testar->setAlignment(Qt::AlignRight); // 设置滚动条位置 testar->setWidget(m_arWidget); // 将设置好的幕布嵌入到滚动显示区域 testar->setWidgetResizable(true); // 设置幕布自适应大小 - testar->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)); - testar->setMinimumSize(800, 800); + testar->setSizePolicy(sp); + testar->setMinimumSize(700, 500); } m_regBoxLayoutL1 = new QVBoxLayout(m_regBox); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 44c8437..2a64960 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 1448 - 1040 + 1458 + 556 @@ -1164,7 +1164,7 @@ p, li { white-space: pre-wrap; } 0 0 - 1448 + 1458 20